Merge lp:~akopytov/percona-xtrabackup/bug834657-1.6 into lp:percona-xtrabackup/1.6

[Alexey Kopytov]

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

[Stewart Smith (stewart)]

review: Approve

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2011-06-11 08:00:46 +0000
+++ innobackupex	2011-08-30 03:13:23 +0000
@@ -359,20 +359,25 @@
         wait_for_ibbackup_suspend();
     }
 
+    if ($option_safe_slave_backup) {
+      mysql_open();
+      mysql_check();
+      wait_for_safe_slave();
+      mysql_close();
+    }
+
     if (!$option_incremental) {
         # connect to database
         mysql_open();
 
-        if ( $option_safe_slave_backup ) {
-          wait_for_safe_slave();
-        }
-
         # flush tables with read lock
         mysql_check();
         mysql_lockall() if !$option_no_lock;
 
     }
 
+    write_slave_info() if $option_slave_info;
+
     # backup .frm, .MRG, .MYD, .MYI, .TRG, .TRN, .ARM, .ARZ, .CSM, .CSV and .opt files
     backup_files();
 
@@ -383,15 +388,18 @@
         # release read locks on all tables
         mysql_unlockall() if !$option_no_lock;
 
-       if ( $option_safe_slave_backup ) {
-         print STDERR "$prefix: Starting slave SQL thread\n";
-         mysql_send('START SLAVE SQL_THREAD;');
-       }
-
         # disconnect from database
         mysql_close();
     }
 
+    if ( $option_safe_slave_backup ) {
+      mysql_open();
+      mysql_check();
+      print STDERR "$prefix: Starting slave SQL thread\n";
+      mysql_send('START SLAVE SQL_THREAD;');
+      mysql_close();
+    }
+
     if ($option_remote_host) {
         system("scp $option_scp_opt '$tmp_logfile' '$option_remote_host:$backup_dir/xtrabackup_logfile'")
             and Die "Failed to scp file '$option_remote_host:$backup_dir/xtrabackup_logfile': $!";
@@ -1203,7 +1211,6 @@
         mysql_send "COMMIT;";
     }
     write_binlog_info;
-    write_slave_info if $option_slave_info;
 	
     $now = current_time();
     print STDERR "$now  $prefix All tables locked and flushed to disk\n";
@@ -1670,6 +1677,14 @@
         $backup_dir = File::Spec->rel2abs($ARGV[0]);
     }        
 
+    if ($option_slave_info) {
+        if (($option_no_lock or $option_incremental) and
+	    !$option_safe_slave_backup) {
+	  print STDERR "--slave-info is used with either --no-lock or --incremental but without --safe-slave-backup. The binlog position cannot be consistent with the backup data.\n";
+	    exit(1);
+	}
+    }
+
     print STDERR "\n";
 
     parse_databases_option_value();

=== added file 'test/t/ib_slave_info.sh'
--- test/t/ib_slave_info.sh	1970-01-01 00:00:00 +0000
+++ test/t/ib_slave_info.sh	2011-08-30 03:13:23 +0000
@@ -0,0 +1,28 @@
+. inc/common.sh
+
+init
+run_mysqld --innodb_file_per_table
+load_dbase_schema incremental_sample
+
+# Adding initial rows
+vlog "Adding initial rows to database..."
+numrow=100
+count=0
+while [ "$numrow" -gt "$count" ]
+do
+	${MYSQL} ${MYSQL_ARGS} -e "insert into test values ($count, $numrow);" incremental_sample
+	let "count=count+1"
+done
+vlog "Initial rows added"
+
+# Full backup
+# backup root directory
+mkdir -p $topdir/backup
+
+vlog "Check that --slave-info with --no-lock and no --safe-slave-backup fails"
+run_cmd_expect_failure $IB_BIN $IB_ARGS --slave-info --no-lock $topdir/backup
+
+vlog "Check that --slave-info with --incremental and no --safe-slave-backup fails"
+run_cmd_expect_failure $IB_BIN $IB_ARGS --slave-info --incremental --incremental-basedir=$topdir/backup $topdir/backup
+
+# TODO: add positive tests when the test suite is able to setup replication