Merge lp:~akopytov/percona-xtrabackup/bug907147-1.7 into lp:percona-xtrabackup/2.0

[Alexey Kopytov]

[Alexey Kopytov (akopytov)]

http://jenkins.percona.com/view/Percona%20Xtrabackup/job/percona-xtrabackup-param/97/

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2011-12-17 03:23:36 +0000
+++ innobackupex	2011-12-21 06:02:27 +0000
@@ -1179,7 +1179,7 @@
     # get "show master status" output lines (2) from mysql output
     file_to_array($mysql_stdout, \@lines);
     foreach my $line (@lines) {
-        if ($line =~ m/innobackup hello/) {
+        if ($line =~ m/xtrabackup ping/) {
             # this is a hello message, ignore it
         } else {
             # this is output line from "show master status"
 
=== added file 'test/t/ib_binlog_info.sh'
--- test/t/ib_binlog_info.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_binlog_info.sh	2011-12-21 06:02:27 +0000
@@ -0,0 +1,14 @@
+##########################################################################
+# Bug #907147: 1.6.4-313 loses master log info                           #
+##########################################################################
+
+. inc/common.sh
+
+init
+run_mysqld
+load_sakila
+
+innobackupex --no-timestamp $topdir/backup
+
+run_cmd_expect_failure grep "xtrabackup ping" \
+    $topdir/backup/xtrabackup_binlog_info