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

[Alexey Kopytov]

    Bug #1190716: innobackupex --safe-slave-backup hangs when used on
                  master

    The problem was in uninitialized value usage in wait_for_safe_slave()
    when the server is not a replication slave, i.e. when no values in
    $con->{slave_status} are defined.

    Fixed by moving the check for $con->{slave_status}->{Slave_SQL_Running}
    after the check for $host_is_slave and checking if Slave_SQL_Running is
    defined when setting $host_is_slave for extra-safety.

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

[Laurynas Biveinis (laurynas-biveinis)]

Approved with a re-push to fix -

"$sql_thread_started = 1" is indented differently from the rest of wait_for_safe_slave().

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2013-05-22 10:25:21 +0000
+++ innobackupex	2013-06-14 07:29:28 +0000
@@ -2860,19 +2860,20 @@
    $sql_thread_started = 0;
    get_mysql_slave_status($con);
 
-   if (defined($con->{slave_status}->{Read_Master_Log_Pos})) {
+   if (defined($con->{slave_status}->{Read_Master_Log_Pos}) and
+       defined($con->{slave_status}->{Slave_SQL_Running})) {
          $host_is_slave = 1;
    }
 
-   if ($con->{slave_status}->{Slave_SQL_Running} =~ m/Yes/ ) {
-         $sql_thread_started = 1;
-   }
-
    if ( !$host_is_slave ) {
       print STDERR "$prefix: Not checking slave open temp tables for --safe-slave-backup because host is not a slave\n";
       return;
    }
 
+   if ($con->{slave_status}->{Slave_SQL_Running} =~ m/Yes/ ) {
+         $sql_thread_started = 1;
+   }
+
    if ($sql_thread_started) {
        mysql_query($con, 'STOP SLAVE SQL_THREAD');
    }

=== added file 'test/t/bug1190716.sh'
--- test/t/bug1190716.sh	1970-01-01 00:00:00 +0000
+++ test/t/bug1190716.sh	2013-06-14 07:29:28 +0000
@@ -0,0 +1,11 @@
+##########################################################################
+# Bug #1190716: innobackupex --safe-slave-backup hangs when used on master
+##########################################################################
+
+. inc/common.sh
+
+start_server
+
+innobackupex --no-timestamp --safe-slave-backup $topdir/backup
+
+grep -q "Not checking slave open temp tables for --safe-slave-backup because host is not a slave" $OUTFILE