mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-02 02:34:19 +00:00
PT-2340 - Support MySQL 8.4
- 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:
@@ -68,6 +68,9 @@ our @EXPORT = qw(
|
||||
$sandbox_version
|
||||
$can_load_data
|
||||
$test_diff
|
||||
$source_name
|
||||
$source_status
|
||||
$replica_name
|
||||
);
|
||||
|
||||
our $trunk = $ENV{PERCONA_TOOLKIT_BRANCH};
|
||||
@@ -78,6 +81,15 @@ eval {
|
||||
$sandbox_version = $v if $v;
|
||||
};
|
||||
|
||||
our $source_name = 'source';
|
||||
our $source_status = 'binary log';
|
||||
our $replica_name = 'replica';
|
||||
if ( $sandbox_version < '8.1' || ( $ENV{FORK} || "" eq 'mariadb' ) ) {
|
||||
$source_name = 'master';
|
||||
$source_status = 'master';
|
||||
$replica_name = 'slave';
|
||||
}
|
||||
|
||||
our $can_load_data = can_load_data();
|
||||
|
||||
our $test_diff = '';
|
||||
@@ -137,6 +149,12 @@ our $dsn_opts = [
|
||||
dsn => 'user',
|
||||
copy => 1,
|
||||
},
|
||||
{
|
||||
key => 'mysql_ssl',
|
||||
desc => 'Use SSL',
|
||||
dsn => 'mysql_ssl',
|
||||
copy => 1,
|
||||
},
|
||||
];
|
||||
|
||||
# Runs code, captures and returns its output.
|
||||
|
Reference in New Issue
Block a user