mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-27 07:54:58 +00:00
PT-2340 - Support MySQL 8.4
- Removed runtime.txt after discussion with Anastasia Alexandrova - Added "use VersionParser" into tests in t/lib when needed - Removed word master from tests for pt-archiver, pt-config-diff, pt-deadlock-logger, pt-duplicate-key-checker, pt-find, pt-fk-error-logger, pt-heartbeat, pt-index-usage, pt-ioprofile, pt-kill, pt-mysql-summary - Removed word slave from tests for pt-archiver, pt-config-diff, pt-deadlock-logger, pt-duplicate-key-checker, pt-find, pt-fk-error-logger, pt-heartbeat, pt-index-usage, pt-ioprofile, pt-kill, pt-mysql-summary - Updated modules for pt-archiver, pt-config-diff, pt-deadlock-logger, pt-duplicate-key-checker, pt-find, pt-fk-error-logger, pt-heartbeat, pt-index-usage, pt-ioprofile, pt-kill, pt-mysql-summary - Changed mysql_ssl patch, so it is now short option s - Added a check for existing zombies in t/pt-kill/execute_command.t - Added bin/pt-galera-log-explainer to .gitignore
This commit is contained in:
@@ -19,15 +19,15 @@ require "$trunk/bin/pt-deadlock-logger";
|
||||
|
||||
my $dp = new DSNParser(opts=>$dsn_opts);
|
||||
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
|
||||
my $dbh1 = $sb->get_dbh_for('master', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
|
||||
my $dbh2 = $sb->get_dbh_for('master', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
|
||||
my $dbh1 = $sb->get_dbh_for('source', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
|
||||
my $dbh2 = $sb->get_dbh_for('source', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
|
||||
|
||||
if ( !$dbh1 || !$dbh2 ) {
|
||||
plan skip_all => 'Cannot connect to sandbox master';
|
||||
plan skip_all => 'Cannot connect to sandbox source';
|
||||
}
|
||||
|
||||
my $output;
|
||||
my $dsn = $sb->dsn_for('master');
|
||||
my $dsn = $sb->dsn_for('source');
|
||||
my @args = ($dsn, qw(--iterations 1));
|
||||
|
||||
$dbh1->commit;
|
||||
@@ -98,7 +98,7 @@ sub make_deadlock {
|
||||
sub reconnect {
|
||||
my $dbh = shift;
|
||||
$dbh->disconnect();
|
||||
$dbh = $sb->get_dbh_for('master', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
|
||||
$dbh = $sb->get_dbh_for('source', { PrintError => 0, RaiseError => 1, AutoCommit => 0 });
|
||||
return $dbh;
|
||||
}
|
||||
|
||||
@@ -209,7 +209,7 @@ SKIP: {
|
||||
$output = 'foo';
|
||||
$dbh1->do('TRUNCATE TABLE test.deadlocks');
|
||||
|
||||
$sb->load_file('master', "t/pt-deadlock-logger/samples/dead-lock-with-partitions.sql");
|
||||
$sb->load_file('source', "t/pt-deadlock-logger/samples/dead-lock-with-partitions.sql");
|
||||
|
||||
make_deadlock();
|
||||
|
||||
|
@@ -17,7 +17,7 @@ require "$trunk/bin/pt-deadlock-logger";
|
||||
|
||||
my $dp = new DSNParser(opts=>$dsn_opts);
|
||||
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
|
||||
my $dbh = $sb->get_dbh_for('master');
|
||||
my $dbh = $sb->get_dbh_for('source');
|
||||
|
||||
my ($output, $exist_status) = full_output(
|
||||
sub {
|
||||
|
@@ -17,10 +17,10 @@ require "$trunk/bin/pt-deadlock-logger";
|
||||
|
||||
my $dp = new DSNParser(opts=>$dsn_opts);
|
||||
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
|
||||
my $dbh1 = $sb->get_dbh_for('master');
|
||||
my $dbh1 = $sb->get_dbh_for('source');
|
||||
|
||||
if ( !$dbh1 ) {
|
||||
plan skip_all => 'Cannot connect to sandbox master';
|
||||
plan skip_all => 'Cannot connect to sandbox source';
|
||||
}
|
||||
|
||||
my $output;
|
||||
|
@@ -17,14 +17,14 @@ require "$trunk/bin/pt-deadlock-logger";
|
||||
|
||||
my $dp = new DSNParser(opts=>$dsn_opts);
|
||||
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
|
||||
my $dbh1 = $sb->get_dbh_for('master');
|
||||
my $dbh1 = $sb->get_dbh_for('source');
|
||||
|
||||
if ( !$dbh1 ) {
|
||||
plan skip_all => 'Cannot connect to sandbox master';
|
||||
plan skip_all => 'Cannot connect to sandbox source';
|
||||
}
|
||||
|
||||
my $output;
|
||||
my $dsn = $sb->dsn_for('master');
|
||||
my $dsn = $sb->dsn_for('source');
|
||||
|
||||
$sb->create_dbs($dbh1, ['test']);
|
||||
|
||||
|
@@ -17,14 +17,14 @@ require "$trunk/bin/pt-deadlock-logger";
|
||||
|
||||
my $dp = new DSNParser(opts=>$dsn_opts);
|
||||
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
|
||||
my $dbh = $sb->get_dbh_for('master');
|
||||
my $dbh = $sb->get_dbh_for('source');
|
||||
|
||||
if ( !$dbh ) {
|
||||
plan skip_all => 'Cannot connect to sandbox master';
|
||||
plan skip_all => 'Cannot connect to sandbox source';
|
||||
}
|
||||
|
||||
my $output;
|
||||
my $dsn = $sb->dsn_for('master');
|
||||
my $dsn = $sb->dsn_for('source');
|
||||
my @args = ($dsn, qw(--iterations 1));
|
||||
|
||||
$sb->wipe_clean($dbh);
|
||||
@@ -78,7 +78,7 @@ unlink $pid_file if -f $pid_file;
|
||||
# #############################################################################
|
||||
$dbh->do('USE test');
|
||||
$dbh->do('DROP TABLE IF EXISTS deadlocks');
|
||||
$sb->load_file('master', 't/pt-deadlock-logger/samples/deadlocks_tbl.sql', 'test');
|
||||
$sb->load_file('source', 't/pt-deadlock-logger/samples/deadlocks_tbl.sql', 'test');
|
||||
|
||||
$output = `$trunk/bin/pt-deadlock-logger $dsn --dest D=test,t=deadlocks --daemonize --run-time 10 --interval 1 --pid $pid_file 1>/dev/null 2>/dev/null`;
|
||||
|
||||
|
Reference in New Issue
Block a user