PT-2340 - Support MySQL 8.4

- Updated modules and tests for pt-online-schema-change
- Removed typo from lib/MasterSlave.pm
This commit is contained in:
Sveta Smirnova
2024-07-29 18:47:13 +03:00
parent 5c999ca3e0
commit 76c1202cb5
69 changed files with 1606 additions and 1380 deletions

View File

@@ -24,11 +24,11 @@ $Data::Dumper::Quotekeys = 0;
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $dbh1 = $sb->get_dbh_for('master');
my $dbh2 = $sb->get_dbh_for('master');
my $dbh1 = $sb->get_dbh_for('source');
my $dbh2 = $sb->get_dbh_for('source');
if ( !$dbh1 || !$dbh2 ) {
plan skip_all => 'Cannot connect to sandbox master';
plan skip_all => 'Cannot connect to sandbox source';
}
elsif ( $sandbox_version lt '5.5' ) {
plan skip_all => "Metadata locks require MySQL 5.5 and newer";
@@ -38,14 +38,14 @@ elsif ($sb->is_cluster_mode) {
}
my $output;
my $master_dsn = $sb->dsn_for('master');
my $source_dsn = $sb->dsn_for('source');
my $sample = "t/pt-online-schema-change/samples";
my $plugin = "$trunk/$sample/plugins";
my $exit;
my $rows;
# Loads pt_osc.t with cols id (pk), c (unique index),, d.
$sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
$sb->load_file('source', "$sample/basic_no_fks_innodb.sql");
# #############################################################################
# Meta-block on create_triggers.
@@ -53,7 +53,7 @@ $sb->load_file('master', "$sample/basic_no_fks_innodb.sql");
($output) = full_output(
sub { pt_online_schema_change::main(
"$master_dsn,D=pt_osc,t=t",
"$source_dsn,D=pt_osc,t=t",
qw(--statistics --execute --tries drop_triggers:1:0.01),
qw(--set-vars lock_wait_timeout=1 --print --no-swap-tables),
'--plugin', "$plugin/make_drop_trigger_fail.pm",