percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-10 13:11:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

PT-2340 - Support MySQL 8.4

Browse Source 
- Updated modules and tests for pt-table-sync, pt-table-usage, pt-upgrade, pt-variable-advisor
This commit is contained in:
Sveta Smirnova
2024-08-03 17:03:48 +03:00
parent 56599f01ad
commit a38bee6d60
69 changed files with 1442 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
t/pt-table-sync/pt-1256.t
View File

@@ -23,18 +23,18 @@ require VersionParser;
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $master_dbh = $sb->get_dbh_for('master');
my $slave1_dbh = $sb->get_dbh_for('slave1');
my $slave2_dbh = $sb->get_dbh_for('slave2');
my $source_dbh = $sb->get_dbh_for('source');
my $replica1_dbh = $sb->get_dbh_for('replica1');
my $replica2_dbh = $sb->get_dbh_for('replica2');
if ( !$master_dbh ) {
plan skip_all => 'Cannot connect to sandbox master';
if ( !$source_dbh ) {
plan skip_all => 'Cannot connect to sandbox source';
}
elsif ( !$slave1_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave1';
elsif ( !$replica1_dbh ) {
plan skip_all => 'Cannot connect to sandbox replica1';
}
elsif ( !$slave1_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave2';
elsif ( !$replica1_dbh ) {
plan skip_all => 'Cannot connect to sandbox replica2';
}
else {
plan tests => 5;
@@ -42,25 +42,25 @@ else {
my ($output, $status);
my @args = ('--sync-to-master', 'h=127.1,P=12346,u=msandbox,p=msandbox',
my @args = ('--sync-to-source', 'h=127.1,P=12346,u=msandbox,p=msandbox',
qw(-t test.t1 --print --execute --charset utf8));
# use lib/samples dir since the main change is in DSNParser
$sb->load_file('master', "t/lib/samples/charset.sql");
$sb->load_file('source', "t/lib/samples/charset.sql");
my $put = encode('UTF-8','абвгд');
my $want = 'абвгд';
my $row;
$master_dbh->do("SET NAMES 'utf8'");
$slave1_dbh->do("SET NAMES 'utf8'");
$slave1_dbh->do("SET NAMES 'utf8'");
$source_dbh->do("SET NAMES 'utf8'");
$replica1_dbh->do("SET NAMES 'utf8'");
$replica1_dbh->do("SET NAMES 'utf8'");
$master_dbh->do("INSERT INTO test.t1 VALUES (NULL, '$put')");
$sb->wait_for_slaves();
$source_dbh->do("INSERT INTO test.t1 VALUES (NULL, '$put')");
$sb->wait_for_replicas();
$slave1_dbh->do("DELETE FROM test.t1 WHERE id=1 LIMIT 1");
$slave1_dbh->do("FLUSH TABLES");
$replica1_dbh->do("DELETE FROM test.t1 WHERE id=1 LIMIT 1");
$replica1_dbh->do("FLUSH TABLES");
# 1
@@ -75,12 +75,12 @@ like(
);
SKIP: {
my $vp = VersionParser->new($master_dbh);
my $vp = VersionParser->new($source_dbh);
if ($vp->cmp('8.0') > -1 && $vp->cmp('8.0.14') < 0 && $vp->flavor() !~ m/maria/i) {
skip "Skipping in MySQL 8.0.4-rc - 8.0.13 since there is an error in the server itself", 3;
}
# 2
$row = $slave1_dbh->selectrow_hashref("SELECT f2 FROM test.t1 WHERE id = 1");
$row = $replica1_dbh->selectrow_hashref("SELECT f2 FROM test.t1 WHERE id = 1");
is(
$row->{f2},
$want,
@@ -93,7 +93,7 @@ SKIP: {
like($output, qr/COMMENT='test1'/, '--lock-and-rename worked');
#4
$row = $slave1_dbh->selectrow_hashref("SELECT f2 FROM test.t2 WHERE id = 1");
$row = $replica1_dbh->selectrow_hashref("SELECT f2 FROM test.t2 WHERE id = 1");
is(
$row->{f2},
$want,
@@ -103,6 +103,6 @@ SKIP: {
# #############################################################################
# Done.
# #############################################################################
$sb->wipe_clean($master_dbh);
$sb->wipe_clean($source_dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
exit;