Merge lp:~percona-toolkit-dev/percona-toolkit/test-pt-archiver-sql-log-bug-903387-2.0 into lp:percona-toolkit/2.0

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 't/pt-archiver/basics.t'
--- t/pt-archiver/basics.t	2012-05-30 20:59:47 +0000
+++ t/pt-archiver/basics.t	2012-07-26 20:38:21 +0000
@@ -18,11 +18,15 @@
 
 my $dp  = new DSNParser(opts=>$dsn_opts);
 my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
-my $dbh = $sb->get_dbh_for('master');
+my $master_dbh = $sb->get_dbh_for('master');
+my $slave1_dbh = $sb->get_dbh_for('slave1');
 
-if ( !$dbh ) {
+if ( !$master_dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
+elsif ( !$slave1_dbh ) {
+   plan skip_all => 'Cannot connect to sandbox slave1';
+}
 
 my $output;
 my $rows;
@@ -30,14 +34,14 @@
 my $cmd = "$trunk/bin/pt-archiver";
 
 # Make sure load works.
-$sb->create_dbs($dbh, ['test']);
+$sb->create_dbs($master_dbh, ['test']);
 $sb->load_file('master', 't/pt-archiver/samples/tables1-4.sql');
-$rows = $dbh->selectrow_arrayref('select count(*) from test.table_1')->[0];
+$rows = $master_dbh->selectrow_arrayref('select count(*) from test.table_1')->[0];
 if ( ($rows || 0) != 4 ) {
    plan skip_all => 'Failed to load tables1-4.sql';
 }
 else {
-   plan tests => 25;
+   plan tests => 28;
 }
 
 my @args = qw(--dry-run --where 1=1);
@@ -186,7 +190,56 @@
 );
 
 # #############################################################################
+# Bug 903387: pt-archiver doesn't honor b=1 flag to create SQL_LOG_BIN statement
+# #############################################################################
+
+$sb->load_file('master', "t/pt-archiver/samples/bulk_regular_insert.sql");
+PerconaTest::wait_for_table($slave1_dbh, "bri.t", "id=10");
+
+my $original_rows = $slave1_dbh->selectall_arrayref("SELECT * FROM bri.t ORDER BY id");
+is_deeply(
+   $original_rows,
+   [
+      [1, 'aa', '11:11:11'],
+      [2, 'bb', '11:11:12'],
+      [3, 'cc', '11:11:13'],
+      [4, 'dd', '11:11:14'],
+      [5, 'ee', '11:11:15'],
+      [6, 'ff', '11:11:16'],
+      [7, 'gg', '11:11:17'],
+      [8, 'hh', '11:11:18'],
+      [9, 'ii', '11:11:19'],
+      [10,'jj', '11:11:10'],
+   ],
+   "Bug 903387: slave has rows"
+);
+
+$output = output(
+   sub { pt_archiver::main(
+      '--source', "D=bri,t=t,F=$cnf,b=1",
+      '--dest',   "D=bri,t=t_arch",
+      qw(--where 1=1 --replace --commit-each --bulk-insert --bulk-delete),
+      qw(--limit 10)) },
+);
+
+$rows = $master_dbh->selectall_arrayref("SELECT * FROM bri.t ORDER BY id");
+is_deeply(
+   $rows,
+   [
+      [10,'jj', '11:11:10'],
+   ],
+   "Bug 903387: rows deleted on master"
+) or diag(Dumper($rows));
+
+$rows = $slave1_dbh->selectall_arrayref("SELECT * FROM bri.t ORDER BY id");
+is_deeply(
+   $rows,
+   $original_rows,
+   "Bug 903387: slave still has rows"
+) or diag(Dumper($rows));
+
+# #############################################################################
 # Done.
 # #############################################################################
-$sb->wipe_clean($dbh);
+$sb->wipe_clean($master_dbh);
 exit;