Merge lp:~akopytov/percona-xtrabackup/bug1168513 into lp:percona-xtrabackup/2.1

[Alexey Kopytov]

    Bug #1168513: innobackupex uses SHOW MASTER STATUS to obtain binlog file
                  and position

    Do not create xtrabackup_binlog_info file (and thus do not attempt to
    use undefined values in write_binlog_info()) when no binary log
    information is available.

http://jenkins.percona.com/view/XtraBackup/job/percona-xtrabackup-2.1-param/253/

[Laurynas Biveinis (laurynas-biveinis)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-04-09 10:58:46 +0000
+++ innobackupex	2013-04-13 08:15:32 +0000
@@ -1335,6 +1335,11 @@
     my $filename = $con->{master_status}->{File};
     my $position = $con->{master_status}->{Position};
 
+    # Do not create xtrabackup_binlog_info if binary log is disabled
+    if (!defined($filename) or !defined($position)) {
+        return;
+    }
+
     # write binlog info file
     open(FILE, ">$binlog_info") || Die "Failed to open file '$binlog_info': $!";
     print FILE  "$filename\t$position\t\t\n";

=== added file 'test/t/bug1168513.sh'
--- test/t/bug1168513.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1168513.sh	2013-04-13 08:15:32 +0000
@@ -0,0 +1,18 @@
+##############################################################################
+# Bug #1168513: innobackupex uses SHOW MASTER STATUS to obtain binlog file and
+#               position
+##############################################################################
+
+. inc/common.sh
+
+# Make sure we start the server with the binary log disabled
+start_server --skip-log-bin
+
+innobackupex --no-timestamp $topdir/backup
+
+# Check that to xtrabackup_binlog_info file is created
+if [ -f $topdir/backup/xtrabackup_binlog_info ]
+then
+    vlog "$topdir/backup/xtrabackup_binlog_info should not be created!"
+    exit -1
+fi