Merge lp:~akopytov/percona-xtrabackup/support-gtid-2.1 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

    Implementation of
    https://blueprints.launchpad.net/percona-xtrabackup/+spec/support-gtid

    Include the value of gtid_executed (or its Executed_Gtid_Set
    equivalent from SHOW MASTER STATUS) into xtrabackup_binlog_info. The
    value (when available) is also printed by innobackupex along with the
    binary log position, e.g.:

    "
    innobackupex: MySQL binlog position: filename 'mysql-bin.000003',
    position 1781, gtid_executed bf9000c0-acc2-11e2-a411-ae6a09f09722:1-3
    "
http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/271/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-04-24 12:46:07 +0000
+++ innobackupex	2013-04-24 14:16:35 +0000
@@ -1461,6 +1461,7 @@
     # from the SHOW MASTER STATUS output
     my $filename = $con->{master_status}->{File};
     my $position = $con->{master_status}->{Position};
+    my $gtid = $con->{master_status}->{Executed_Gtid_Set} || '';
 
     # Do not create xtrabackup_binlog_info if binary log is disabled
     if (!defined($filename) or !defined($position)) {
@@ -1469,7 +1470,7 @@
 
     # write binlog info file
     open(FILE, ">$binlog_info") || Die "Failed to open file '$binlog_info': $!";
-    print FILE  "$filename\t$position\t\t\n";
+    print FILE  "$filename\t$position\t\t$gtid\n";
     close(FILE);
 
     if ($option_stream) {
@@ -1479,6 +1480,9 @@
     }
 
     $mysql_binlog_position = "filename '$filename', position $position";
+    if ($gtid) {
+        $mysql_binlog_position .= ", gtid_executed $gtid";
+    }
 }
 
 #

=== added file 'test/t/gtid.sh'
--- test/t/gtid.sh	1970-01-01 00:00:00 +0000
+++ test/t/gtid.sh	2013-04-24 14:16:35 +0000
@@ -0,0 +1,41 @@
+########################################################################
+# Test support for GTID
+########################################################################
+
+. inc/common.sh
+
+if [ ${MYSQL_VERSION:0:3} != "5.6" ]
+then
+    echo "Requires a 5.6 server" > $SKIPPED_REASON
+    exit $SKIPPED_EXIT_CODE
+fi
+
+MYSQLD_EXTRA_MY_CNF_OPTS="
+gtid_mode=on
+log_slave_updates=on
+enforce_gtid_consistency=on
+"
+start_server
+
+$MYSQL $MYSQL_ARGS test <<EOF
+CREATE TABLE t(id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, c INT);
+INSERT INTO t(c) VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+SET AUTOCOMMIT=0;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+INSERT INTO t(c) SELECT c FROM t;
+COMMIT;
+EOF
+
+innobackupex --no-timestamp $topdir/backup
+
+# Check that the value of gtid_executed is in xtrabackup_binlog_info
+if ! egrep -q '^mysql-bin.[0-9]+[[:space:]]+[0-9]+[[:space:]]+[a-f0-9:-]+$' \
+    $topdir/backup/xtrabackup_binlog_info
+then
+    die "Cannot find GTID coordinates in xtrabackup_binlog_info"
+fi