mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-07 04:49:48 +00:00
PT-2340 - Support MySQL 8.4
- Adjusted sandbox scripts, so they can start MySQL 8.4 - Added MySQL 8.4 configuration file - Removed empty file sandbox/5.6 - Removed unused files sandbox/set-mysql, sandbox/slave_channels_t.sql, sandbox/jenkins-test - Removed offensive terminology from the sandbox scripts wherever it is possible
This commit is contained in:
@@ -839,7 +839,7 @@ SKIP: {
|
||||
# After stopping one of the replication channels, show slave status returns only one slave
|
||||
# but it has a channel name and we didn't specified a channels name in the command line.
|
||||
# It should return undef
|
||||
$slave1_dbh->do("STOP SLAVE for channel 'masterchan2'");
|
||||
$slave1_dbh->do("STOP SLAVE for channel 'sourcechan2'");
|
||||
|
||||
eval {
|
||||
$css = $ms->get_slave_status($slave1_dbh);
|
||||
@@ -850,14 +850,14 @@ SKIP: {
|
||||
'Cannot determine slave in a multi source config without --channel param (only one server)'
|
||||
);
|
||||
|
||||
$slave1_dbh->do("START SLAVE for channel 'masterchan2'");
|
||||
$slave1_dbh->do("START SLAVE for channel 'sourcechan2'");
|
||||
|
||||
# Now try specifying a channel name
|
||||
$ms->{channel} = 'masterchan1';
|
||||
$ms->{channel} = 'sourcechan1';
|
||||
$css = $ms->get_slave_status($slave1_dbh);
|
||||
is (
|
||||
$css->{channel_name},
|
||||
'masterchan1',
|
||||
'sourcechan1',
|
||||
'Returned the correct slave',
|
||||
);
|
||||
|
||||
|
@@ -91,10 +91,10 @@ like (
|
||||
'Message saying channel name must be specified'
|
||||
);
|
||||
|
||||
push @args, ('--channel', 'masterchan1');
|
||||
push @args, ('--channel', 'sourcechan1');
|
||||
|
||||
output(
|
||||
sub { $exit_status = pt_archiver::main(@args, '--channel', 'masterchan1') },
|
||||
sub { $exit_status = pt_archiver::main(@args, '--channel', 'sourcechan1') },
|
||||
stderr => 1,
|
||||
);
|
||||
|
||||
|
@@ -49,7 +49,7 @@ $sb->load_file('chan_master1', "sandbox/gtid_on.sql", undef, no_wait => 1);
|
||||
$sb->load_file('chan_master2', "sandbox/gtid_on.sql", undef, no_wait => 1);
|
||||
$sb->load_file('chan_slave1', "sandbox/slave_channels.sql", undef, no_wait => 1);
|
||||
|
||||
my @args = qw(--execute --no-foreign-key-checks --verbose --databases=sakila --tables=actor --sync-to-master --channel=masterchan1);
|
||||
my @args = qw(--execute --no-foreign-key-checks --verbose --databases=sakila --tables=actor --sync-to-master --channel=sourcechan1);
|
||||
my $exit_status;
|
||||
|
||||
my $output = output(
|
||||
|
Reference in New Issue
Block a user