mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-24 21:35:00 +00:00
Merged ubuntu-12-64-issues
This commit is contained in:
@@ -363,7 +363,7 @@ is(
|
||||
# Test --where.
|
||||
# #############################################################################
|
||||
$sb->load_file('master', 't/pt-table-checksum/samples/600cities.sql');
|
||||
$master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
|
||||
$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
|
||||
|
||||
$output = output(
|
||||
sub { $exit_status = pt_table_checksum::main(@args,
|
||||
|
@@ -113,7 +113,7 @@ unlike(
|
||||
# on replicas
|
||||
# #############################################################################
|
||||
$sb->load_file('master', 't/pt-table-checksum/samples/600cities.sql');
|
||||
$master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
|
||||
$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-table-checksum/samples/600cities.data' INTO TABLE test.t");
|
||||
$master_dbh->do("SET SQL_LOG_BIN=0");
|
||||
$master_dbh->do("DELETE FROM test.t WHERE id > 100");
|
||||
$master_dbh->do("SET SQL_LOG_BIN=1");
|
||||
|
@@ -43,7 +43,7 @@ my $output;
|
||||
sub load_data_infile {
|
||||
my ($file, $where) = @_;
|
||||
$master_dbh->do('truncate table percona.checksums');
|
||||
$master_dbh->do("LOAD DATA LOCAL INFILE '$trunk/t/pt-table-checksum/samples/checksum_results/$file' INTO TABLE percona.checksums");
|
||||
$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-table-checksum/samples/checksum_results/$file' INTO TABLE percona.checksums");
|
||||
if ( $where ) {
|
||||
PerconaTest::wait_for_table($slave1_dbh, 'percona.checksums', $where);
|
||||
}
|
||||
|
@@ -69,7 +69,7 @@ wait_until(sub {
|
||||
# wait for it to stop "lagging".
|
||||
($output) = PerconaTest::full_output(
|
||||
sub { pt_table_checksum::main(@args, qw(-t sakila.city)) },
|
||||
wait_for => 3,
|
||||
wait_for => 10,
|
||||
);
|
||||
|
||||
like(
|
||||
|
Reference in New Issue
Block a user