Merged ubuntu-12-64-issues

t/pt-archiver/bulk_insert.t

@@ -22,8 +22,12 @@ my $dbh = $sb->get_dbh_for('master');
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
+elsif ( PerconaTest::load_data_is_disabled($dbh) ) {
+   diag("LOAD DATA LOCAL INFILE is disabled, only going to test the error message");
+   plan tests => 2;
+}
 else {
-   plan tests => 10;
+   plan tests => 11;
 }
 
 my $output;
@@ -31,6 +35,11 @@ my $rows;
 my $cnf = "/tmp/12345/my.sandbox.cnf";
 my $cmd = "$trunk/bin/pt-archiver";
 
+if ( PerconaTest::load_data_is_disabled($dbh) ) {
+   test_disabled_load_data($dbh, $sb, 'master', $cnf);
+}
+else {
+
 $sb->wipe_clean($dbh);
 $sb->create_dbs($dbh, ['test']);
 
@@ -84,6 +93,45 @@ is_deeply(
    "--bulk-insert archived 7 rows (issue 1260)"
 );
 
+# Test that the tool bails out early if LOAD DATA LOCAL INFILE is disabled
+{
+   if ( -d "/tmp/2900" ) {
+      diag(`$trunk/sandbox/stop-sandbox 2900 >/dev/null 2>&1`);
+   }
+
+   local $ENV{LOCAL_INFILE} = 0;
+   diag(`$trunk/sandbox/start-sandbox master 2900 >/dev/null 2>&1`);
+
+   my $master3_dbh = $sb->get_dbh_for('master3');
+
+   test_disabled_load_data($master3_dbh, $sb, 'master3', "/tmp/2900/my.sandbox.cnf");
+
+   diag(`$trunk/sandbox/stop-sandbox 2900 >/dev/null 2>&1`);
+   $master3_dbh->disconnect() if $master3_dbh;
+}
+
+}
+
+sub test_disabled_load_data {
+   my ($dbh, $sb, $master, $cnf) = @_;
+   $sb->wipe_clean($dbh);
+   $sb->create_dbs($dbh, ['test']);
+   $sb->load_file($master, 't/pt-archiver/samples/table5.sql');
+   $dbh->do('INSERT INTO `test`.`table_5_copy` SELECT * FROM `test`.`table_5`');
+
+   my ($output, undef) = full_output(
+      sub { pt_archiver::main(qw(--no-ascend --limit 50 --bulk-insert),
+         qw(--bulk-delete --where 1=1 --statistics),
+         '--source', "D=test,t=table_5,F=$cnf",
+         '--dest',   "t=table_5_dest") },
+   );
+
+   like($output,
+      qr!\Q--bulk-insert cannot work as LOAD DATA LOCAL INFILE is disabled. See http://kb.percona.com/troubleshoot-load-data-infile!,
+      "--bulk-insert throws an error if LOCAL INFILE is disabled"
+   );
+}
+
 # #############################################################################
 # Done.
 # #############################################################################

t/pt-archiver/bulk_regular_insert.t

@@ -22,6 +22,9 @@ my $dbh = $sb->get_dbh_for('master');
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
+elsif ( PerconaTest::load_data_is_disabled($dbh) ) {
+    plan skip_all => 'Cannot use --bulk-insert with LOAD DATA LOCAL INFILE disabled';
+}
 else {
    plan tests => 5;
 }

t/pt-archiver/check_slave_lag.t

@@ -65,11 +65,14 @@ is_deeply(
    'No changes on slave yet (issue 758)'
 );
 
-is_deeply(
-   $dbh->selectall_arrayref('select * from issue_758.t'),
-   [[0],[2]],
-   'First row purged (issue 758)'
-);
+TODO: {
+   local $::TODO = "Timing-related test, may fail";
+   is_deeply(
+      $dbh->selectall_arrayref('select * from issue_758.t'),
+      [[0],[2]],
+      'First row purged (issue 758)'
+   );
+}
 
 # The script it waiting for slave lag so no more rows should be purged yet.
 sleep 1;

t/pt-archiver/file.t

@@ -22,9 +22,6 @@ my $dbh = $sb->get_dbh_for('master');
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
-else {
-   plan tests => 12;
-}
 
 my $output;
 my $rows;
@@ -80,25 +77,28 @@ sub test_charset {
    
    $sb->load_file('master', 't/pt-archiver/samples/table1.sql');
    local $@;
-   eval {
+   my ($out, $exit_val) = full_output( sub {
       pt_archiver::main("-c", "b,c", qw(--where 1=1 --header),
             "--source", "D=test,t=table_1,F=$cnf",
             '--file', '/tmp/%Y-%m-%d-%D_%H:%i:%s.%t',
             '--no-check-charset',
             '--charset', $charset,
       );
-   };
+   });
 
-   ok !$@, "--charset $charset works";
+   is($exit_val,
+      0,
+      "--charset $charset works"
+   ) or diag($out);
 }
 
-for my $charset (qw(latin1 iso-8859-1 utf8 UTF-8 )) {
+for my $charset (qw(latin1 utf8 UTF8 )) {
    test_charset($charset);
 }
 
 my $warning;
 local $SIG{__WARN__} = sub { $warning .= shift };
-my $out = output( sub {
+my ($out) = full_output( sub {
       $sb->load_file('master', 't/pt-archiver/samples/table1.sql');
       pt_archiver::main("-c", "b,c", qw(--where 1=1 --header),
             "--source", "D=test,t=table_1,F=$cnf",
@@ -109,12 +109,16 @@ my $out = output( sub {
    },
 );
 
-like($out, qr/\QCannot open :encoding(some_chars/, "..but an unknown charset fails");
-like($warning, qr/Cannot find encoding/, "..and throws a useful warning");
+like(
+   $out,
+   qr/\QError setting NAMES to some_charset_that_doesn/,
+   "..but an unknown charset fails"
+);
 
 # #############################################################################
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-exit;
+
+done_testing;