percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-15 16:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

PT-2340 - Support MySQL 8.4

Browse Source 
- Removed offensive terminology from library files and their tests
- Removed unused sandbox/prove2junit.pl
- Added option mysql_ssl to DSN and possibility to have DSN of multiple letters
This commit is contained in:
Sveta Smirnova
2024-07-23 22:28:05 +03:00
parent a530c6f84c
commit e2207ea232
49 changed files with 1131 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/lib/Percona/XtraDB/Cluster-no-PXC.t
View File

@@ -31,7 +31,7 @@ use Percona::XtraDB::Cluster;
my $q = new Quoter();
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $master_dbh = $sb->get_dbh_for('master');
my $master_dbh = $sb->get_dbh_for('source');
my $cluster = Percona::XtraDB::Cluster->new();
my $db_flavor = VersionParser->new($master_dbh)->flavor();
@@ -74,14 +74,14 @@ local @ARGV = ();
$o->get_opts();
diag("Starting master1");
$sb->start_sandbox(type => "master", server => "master1");
$sb->start_sandbox(type => "source", server => "source1");
my ($master_cxn, $slave1_cxn, $master1_cxn)
= map {
my $cxn = make_cxn( dsn_string => $sb->dsn_for($_) );
$cxn->connect();
$cxn;
} qw( master slave1 master1 );
} qw( source replica1 source1 );
for my $cxn ( $master_cxn, $slave1_cxn, $master1_cxn ) {
ok(
@@ -90,7 +90,7 @@ for my $cxn ( $master_cxn, $slave1_cxn, $master1_cxn ) {
);
}
diag($sb->stop_sandbox("master1"));
diag($sb->stop_sandbox("source1"));
# #############################################################################
# Done.

12
t/lib/Percona/XtraDB/Cluster.t
View File

@@ -31,7 +31,7 @@ use Percona::XtraDB::Cluster;
my $q = new Quoter();
my $dp = new DSNParser(opts=>$dsn_opts);
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
my $master_dbh = $sb->get_dbh_for('master');
my $master_dbh = $sb->get_dbh_for('source');
my $cluster = Percona::XtraDB::Cluster->new();
@@ -75,9 +75,9 @@ local @ARGV = ();
$o->get_opts();
diag("Starting master1");
$sb->start_sandbox(type => "master", server => "master1");
$sb->start_sandbox(type => "source", server => "source1");
my $master1_cxn = make_cxn( dsn_string => $sb->dsn_for("master1") );
my $master1_cxn = make_cxn( dsn_string => $sb->dsn_for("source1") );
$master1_cxn->connect();
diag("Starting a 1-node PXC");
@@ -94,7 +94,7 @@ ok(
);
diag("Setting node as a slave of master1");
$sb->set_as_slave("node4", "master1");
$sb->set_as_slave("node4", "source1");
ok(
!$cluster->same_cluster($master1_cxn, $cxn1),
"->same_cluster works for master -> cluster"
@@ -109,7 +109,7 @@ $cxn1 = make_cxn( dsn_string => $c->{node4}->{dsn} );
$cxn1->connect();
diag("Setting master1 as a slave of the node");
$sb->set_as_slave("master1", "node4");
$sb->set_as_slave("source1", "node4");
ok(
!$cluster->same_cluster($cxn1, $master1_cxn),
"->same_cluster works for cluster -> master"
@@ -178,7 +178,7 @@ ok(
diag($sb->stop_sandbox(qw(node4 node5 node6 node7)));
diag($sb->stop_sandbox("master1"));
diag($sb->stop_sandbox("source1"));
# #############################################################################
# Done.