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

PT-2465 patch fix for erroneous flavour mismatch in mariadb-10.5.x and above. This patch includes the fixed regex for checking DB flavour to include the case-insensitive marker i on the searches for MariaDB

Browse Source
This commit is contained in:
Nyele93
2025-08-18 17:42:10 +03:00
parent 6c9deb9d66
commit a97c422851
10 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/pt-archiver
View File

@@ -3932,7 +3932,7 @@ sub _find_replicas_by_hosts {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $sql = 'SHOW REPLICAS'; my $sql = 'SHOW REPLICAS';
my $source_name = 'source'; my $source_name = 'source';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$sql = 'SHOW SLAVE HOSTS'; $sql = 'SHOW SLAVE HOSTS';
$source_name='master'; $source_name='master';
} }
@@ -4055,7 +4055,7 @@ sub get_source_dsn {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_host = 'source_host'; my $source_host = 'source_host';
my $source_port = 'source_port'; my $source_port = 'source_port';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_host = 'master_host'; $source_host = 'master_host';
$source_port = 'master_port'; $source_port = 'master_port';
} }
@@ -4129,7 +4129,7 @@ sub get_source_status {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_name = 'binary log'; my $source_name = 'binary log';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_name = 'master'; $source_name = 'master';
} }
@@ -4572,13 +4572,13 @@ sub get_cxn_from_dsn_table {
sub get_source_name { sub get_source_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'master' : 'source'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'master' : 'source';
} }
sub get_replica_name { sub get_replica_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'slave' : 'replica'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'slave' : 'replica';
} }
sub _d { sub _d {

10
bin/pt-heartbeat
View File

@@ -384,7 +384,7 @@ sub _find_replicas_by_hosts {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $sql = 'SHOW REPLICAS'; my $sql = 'SHOW REPLICAS';
my $source_name = 'source'; my $source_name = 'source';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$sql = 'SHOW SLAVE HOSTS'; $sql = 'SHOW SLAVE HOSTS';
$source_name='master'; $source_name='master';
} }
@@ -507,7 +507,7 @@ sub get_source_dsn {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_host = 'source_host'; my $source_host = 'source_host';
my $source_port = 'source_port'; my $source_port = 'source_port';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_host = 'master_host'; $source_host = 'master_host';
$source_port = 'master_port'; $source_port = 'master_port';
} }
@@ -581,7 +581,7 @@ sub get_source_status {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_name = 'binary log'; my $source_name = 'binary log';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_name = 'master'; $source_name = 'master';
} }
@@ -1024,13 +1024,13 @@ sub get_cxn_from_dsn_table {
sub get_source_name { sub get_source_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'master' : 'source'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'master' : 'source';
} }
sub get_replica_name { sub get_replica_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'slave' : 'replica'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'slave' : 'replica';
} }
sub _d { sub _d {

10
bin/pt-kill
View File

@@ -4206,7 +4206,7 @@ sub _find_replicas_by_hosts {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $sql = 'SHOW REPLICAS'; my $sql = 'SHOW REPLICAS';
my $source_name = 'source'; my $source_name = 'source';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$sql = 'SHOW SLAVE HOSTS'; $sql = 'SHOW SLAVE HOSTS';
$source_name='master'; $source_name='master';
} }
@@ -4329,7 +4329,7 @@ sub get_source_dsn {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_host = 'source_host'; my $source_host = 'source_host';
my $source_port = 'source_port'; my $source_port = 'source_port';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_host = 'master_host'; $source_host = 'master_host';
$source_port = 'master_port'; $source_port = 'master_port';
} }
@@ -4403,7 +4403,7 @@ sub get_source_status {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_name = 'binary log'; my $source_name = 'binary log';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_name = 'master'; $source_name = 'master';
} }
@@ -4846,13 +4846,13 @@ sub get_cxn_from_dsn_table {
sub get_source_name { sub get_source_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'master' : 'source'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'master' : 'source';
} }
sub get_replica_name { sub get_replica_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'slave' : 'replica'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'slave' : 'replica';
} }
sub _d { sub _d {

10
bin/pt-online-schema-change
View File

@@ -4497,7 +4497,7 @@ sub _find_replicas_by_hosts {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $sql = 'SHOW REPLICAS'; my $sql = 'SHOW REPLICAS';
my $source_name = 'source'; my $source_name = 'source';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$sql = 'SHOW SLAVE HOSTS'; $sql = 'SHOW SLAVE HOSTS';
$source_name='master'; $source_name='master';
} }
@@ -4620,7 +4620,7 @@ sub get_source_dsn {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_host = 'source_host'; my $source_host = 'source_host';
my $source_port = 'source_port'; my $source_port = 'source_port';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_host = 'master_host'; $source_host = 'master_host';
$source_port = 'master_port'; $source_port = 'master_port';
} }
@@ -4694,7 +4694,7 @@ sub get_source_status {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_name = 'binary log'; my $source_name = 'binary log';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_name = 'master'; $source_name = 'master';
} }
@@ -5137,13 +5137,13 @@ sub get_cxn_from_dsn_table {
sub get_source_name { sub get_source_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'master' : 'source'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'master' : 'source';
} }
sub get_replica_name { sub get_replica_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'slave' : 'replica'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'slave' : 'replica';
} }
sub _d { sub _d {

10
bin/pt-query-digest
View File

@@ -10803,7 +10803,7 @@ sub _find_replicas_by_hosts {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $sql = 'SHOW REPLICAS'; my $sql = 'SHOW REPLICAS';
my $source_name = 'source'; my $source_name = 'source';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$sql = 'SHOW SLAVE HOSTS'; $sql = 'SHOW SLAVE HOSTS';
$source_name='master'; $source_name='master';
} }
@@ -10926,7 +10926,7 @@ sub get_source_dsn {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_host = 'source_host'; my $source_host = 'source_host';
my $source_port = 'source_port'; my $source_port = 'source_port';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_host = 'master_host'; $source_host = 'master_host';
$source_port = 'master_port'; $source_port = 'master_port';
} }
@@ -11000,7 +11000,7 @@ sub get_source_status {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_name = 'binary log'; my $source_name = 'binary log';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_name = 'master'; $source_name = 'master';
} }
@@ -11443,13 +11443,13 @@ sub get_cxn_from_dsn_table {
sub get_source_name { sub get_source_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'master' : 'source'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'master' : 'source';
} }
sub get_replica_name { sub get_replica_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'slave' : 'replica'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'slave' : 'replica';
} }
sub _d { sub _d {

10
bin/pt-replica-find
View File

@@ -2531,7 +2531,7 @@ sub _find_replicas_by_hosts {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $sql = 'SHOW REPLICAS'; my $sql = 'SHOW REPLICAS';
my $source_name = 'source'; my $source_name = 'source';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$sql = 'SHOW SLAVE HOSTS'; $sql = 'SHOW SLAVE HOSTS';
$source_name='master'; $source_name='master';
} }
@@ -2654,7 +2654,7 @@ sub get_source_dsn {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_host = 'source_host'; my $source_host = 'source_host';
my $source_port = 'source_port'; my $source_port = 'source_port';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_host = 'master_host'; $source_host = 'master_host';
$source_port = 'master_port'; $source_port = 'master_port';
} }
@@ -2728,7 +2728,7 @@ sub get_source_status {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_name = 'binary log'; my $source_name = 'binary log';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_name = 'master'; $source_name = 'master';
} }
@@ -3171,13 +3171,13 @@ sub get_cxn_from_dsn_table {
sub get_source_name { sub get_source_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'master' : 'source'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'master' : 'source';
} }
sub get_replica_name { sub get_replica_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'slave' : 'replica'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'slave' : 'replica';
} }
sub _d { sub _d {

10
bin/pt-replica-restart
View File

@@ -2945,7 +2945,7 @@ sub _find_replicas_by_hosts {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $sql = 'SHOW REPLICAS'; my $sql = 'SHOW REPLICAS';
my $source_name = 'source'; my $source_name = 'source';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$sql = 'SHOW SLAVE HOSTS'; $sql = 'SHOW SLAVE HOSTS';
$source_name='master'; $source_name='master';
} }
@@ -3068,7 +3068,7 @@ sub get_source_dsn {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_host = 'source_host'; my $source_host = 'source_host';
my $source_port = 'source_port'; my $source_port = 'source_port';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_host = 'master_host'; $source_host = 'master_host';
$source_port = 'master_port'; $source_port = 'master_port';
} }
@@ -3142,7 +3142,7 @@ sub get_source_status {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_name = 'binary log'; my $source_name = 'binary log';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_name = 'master'; $source_name = 'master';
} }
@@ -3585,13 +3585,13 @@ sub get_cxn_from_dsn_table {
sub get_source_name { sub get_source_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'master' : 'source'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'master' : 'source';
} }
sub get_replica_name { sub get_replica_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'slave' : 'replica'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'slave' : 'replica';
} }
sub _d { sub _d {

10
bin/pt-table-checksum
View File

@@ -5452,7 +5452,7 @@ sub _find_replicas_by_hosts {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $sql = 'SHOW REPLICAS'; my $sql = 'SHOW REPLICAS';
my $source_name = 'source'; my $source_name = 'source';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$sql = 'SHOW SLAVE HOSTS'; $sql = 'SHOW SLAVE HOSTS';
$source_name='master'; $source_name='master';
} }
@@ -5575,7 +5575,7 @@ sub get_source_dsn {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_host = 'source_host'; my $source_host = 'source_host';
my $source_port = 'source_port'; my $source_port = 'source_port';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_host = 'master_host'; $source_host = 'master_host';
$source_port = 'master_port'; $source_port = 'master_port';
} }
@@ -5649,7 +5649,7 @@ sub get_source_status {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_name = 'binary log'; my $source_name = 'binary log';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_name = 'master'; $source_name = 'master';
} }
@@ -6092,13 +6092,13 @@ sub get_cxn_from_dsn_table {
sub get_source_name { sub get_source_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'master' : 'source'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'master' : 'source';
} }
sub get_replica_name { sub get_replica_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'slave' : 'replica'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'slave' : 'replica';
} }
sub _d { sub _d {

10
bin/pt-table-sync
View File

@@ -6982,7 +6982,7 @@ sub _find_replicas_by_hosts {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $sql = 'SHOW REPLICAS'; my $sql = 'SHOW REPLICAS';
my $source_name = 'source'; my $source_name = 'source';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$sql = 'SHOW SLAVE HOSTS'; $sql = 'SHOW SLAVE HOSTS';
$source_name='master'; $source_name='master';
} }
@@ -7105,7 +7105,7 @@ sub get_source_dsn {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_host = 'source_host'; my $source_host = 'source_host';
my $source_port = 'source_port'; my $source_port = 'source_port';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_host = 'master_host'; $source_host = 'master_host';
$source_port = 'master_port'; $source_port = 'master_port';
} }
@@ -7179,7 +7179,7 @@ sub get_source_status {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_name = 'binary log'; my $source_name = 'binary log';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_name = 'master'; $source_name = 'master';
} }
@@ -7622,13 +7622,13 @@ sub get_cxn_from_dsn_table {
sub get_source_name { sub get_source_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'master' : 'source'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'master' : 'source';
} }
sub get_replica_name { sub get_replica_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'slave' : 'replica'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'slave' : 'replica';
} }
sub _d { sub _d {

10
lib/MasterSlave.pm
View File

@@ -340,7 +340,7 @@ sub _find_replicas_by_hosts {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $sql = 'SHOW REPLICAS'; my $sql = 'SHOW REPLICAS';
my $source_name = 'source'; my $source_name = 'source';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$sql = 'SHOW SLAVE HOSTS'; $sql = 'SHOW SLAVE HOSTS';
$source_name='master'; $source_name='master';
} }
@@ -485,7 +485,7 @@ sub get_source_dsn {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_host = 'source_host'; my $source_host = 'source_host';
my $source_port = 'source_port'; my $source_port = 'source_port';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_host = 'master_host'; $source_host = 'master_host';
$source_port = 'master_port'; $source_port = 'master_port';
} }
@@ -566,7 +566,7 @@ sub get_source_status {
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
my $source_name = 'binary log'; my $source_name = 'binary log';
if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/ ) { if ( $vp lt '8.1' || $vp->flavor() =~ m/maria/i ) {
$source_name = 'master'; $source_name = 'master';
} }
@@ -1123,13 +1123,13 @@ sub get_cxn_from_dsn_table {
sub get_source_name { sub get_source_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'master' : 'source'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'master' : 'source';
} }
sub get_replica_name { sub get_replica_name {
my ($dbh) = @_; my ($dbh) = @_;
my $vp = VersionParser->new($dbh); my $vp = VersionParser->new($dbh);
return ($vp lt '8.1' || $vp->flavor() =~ m/maria/) ? 'slave' : 'replica'; return ($vp lt '8.1' || $vp->flavor() =~ m/maria/i) ? 'slave' : 'replica';
} }
sub _d { sub _d {