Merge lp:~akopytov/percona-xtrabackup/bug977101-2.0 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.0-param/208/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2012-05-23 17:06:52 +0000
+++ innobackupex	2012-06-08 18:50:29 +0000
@@ -1207,28 +1207,21 @@
 #
 sub write_binlog_info {
     my @lines;
-    my @info_lines = ();
     my $position = '';
     my $filename = '';
 
     # get binlog position
-    mysql_send "SHOW MASTER STATUS;";
+    mysql_send 'SHOW MASTER STATUS\G';
 
-    # get "show master status" output lines (2) from mysql output
+    # get the name of the last binlog file and position in it
+    # from the SHOW MASTER STATUS output
     file_to_array($mysql_stdout, \@lines);
-    foreach my $line (@lines) {
-        if ($line =~ m/xtrabackup ping/) {
-            # this is a hello message, ignore it
-        } else {
-            # this is output line from "show master status"
-            push(@info_lines, $line);
-        }
+    foreach (@lines) {
+        $filename = $1 if /^\s+File:\s(\S+)\s*$/;
+        $position = $1 if /^\s+Position:\s(\d+)\s*$/;
     }
 
     # write binlog info file
-    if (!defined $info_lines[1]) {
-        $info_lines[1] = "";
-    }
     if (!$option_remote_host) {
         open(FILE, ">$binlog_info") || 
             Die "Failed to open file '$binlog_info': $!";
@@ -1236,7 +1229,7 @@
         open(FILE, "| ssh $option_ssh_opt $option_remote_host 'cat > $binlog_info'") ||
             Die "Failed to open file '$option_remote_host:$binlog_info': $!";
     }
-    print FILE  "$info_lines[1]\n";
+    print FILE  "$filename\t$position\t\t\n";
     close(FILE);
 
     if ($option_stream) {
@@ -1245,14 +1238,7 @@
         unlink $binlog_info || Die "Failed to delete '$binlog_info': $!";
     }
 
-    # get the name of the last binlog file and position in it
-    ($filename, $position) = $info_lines[1] =~ /^\s*([^\s]+)\s+(.*)$/;
-
-    if (defined $filename && defined $position) {
-        $mysql_binlog_position = "filename '$filename', position $position";
-    } else {
-        $mysql_binlog_position = "filename '', position ";
-    }        
+    $mysql_binlog_position = "filename '$filename', position $position";
 }
 
 #
@@ -1314,7 +1300,7 @@
 	
     # get slave status. Use single quotes here, otherwise
     # \G is evaluated as a control character.
-    mysql_send 'SHOW SLAVE STATUS\G;';
+    mysql_send 'SHOW SLAVE STATUS\G';
 
     # get output of the "show slave status" command from mysql output
     # and extract binlog position of the master server

=== added file 'test/t/bug977101.sh'
--- test/t/bug977101.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug977101.sh	2012-06-08 18:50:29 +0000
@@ -0,0 +1,31 @@
+########################################################################
+# Bug #977101: --safe-slave-backup results in incorrect binlog info
+########################################################################
+
+. inc/common.sh
+
+master_id=1
+slave_id=2
+
+start_server_with_id $master_id
+start_server_with_id $slave_id
+
+setup_slave $slave_id $master_id
+
+# Full backup of the slave server
+switch_server $slave_id
+
+# Check that binlog info is correct with --safe-slave-backup
+innobackupex --no-timestamp --safe-slave-backup $topdir/backup
+egrep -q '^mysql-bin.000001[[:space:]]+[0-9]+[[:space:]]+$' \
+    $topdir/backup/xtrabackup_binlog_info
+
+# Check that both binlog info and slave info are correct with 
+# --safe-slave-backup
+rm -rf $topdir/backup
+innobackupex --no-timestamp --slave-info --safe-slave-backup $topdir/backup
+egrep -q '^mysql-bin.000001[[:space:]]+[0-9]+[[:space:]]+$' \
+    $topdir/backup/xtrabackup_binlog_info
+egrep -q '^CHANGE MASTER TO MASTER_LOG_FILE='\''mysql-bin.000001'\'', MASTER_LOG_POS=[0-9]+$' \
+    $topdir/backup/xtrabackup_slave_info
+