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

[Alexey Kopytov]

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

[Stewart Smith (stewart)]

review: Approve

=== modified file 'innobackupex'
--- innobackupex	2011-06-12 10:17:35 +0000
+++ innobackupex	2011-08-30 03:13:50 +0000
@@ -388,6 +388,7 @@
     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();
@@ -1219,7 +1220,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";
@@ -1686,6 +1686,13 @@
         $backup_dir = File::Spec->rel2abs($ARGV[0]);
     }        
 
+    if ($option_slave_info) {
+        if ($option_no_lock and !$option_safe_slave_backup) {
+	  print STDERR "--slave-info is used with --no-lock 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:50 +0000
@@ -0,0 +1,25 @@
+. 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
+
+# TODO: add positive tests when the test suite is able to setup replication