percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-02-27 02:00:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

PT-2340 - Support MySQL 8.4

Browse Source 
- Updated modules
This commit is contained in:
Sveta Smirnova
2024-10-04 19:06:01 +03:00
parent fcb2d549b8
commit 86fe021434
10 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pt-archiver
View File

@@ -4025,8 +4025,10 @@ sub is_source_of {
. $replica_status->{"${source_name}_user"}; . $replica_status->{"${source_name}_user"};
} }
if ( ($replica_status->{replica_io_state} || '') if ( ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for ${source_name} to send event' ) eq 'Waiting for source to send event' )
|| ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for master to send event' ) )
{ {
my ( $source_log_name, $source_log_num ) my ( $source_log_name, $source_log_num )
= $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/; = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;

6
bin/pt-heartbeat
View File

@@ -486,8 +486,10 @@ sub is_source_of {
. $replica_status->{"${source_name}_user"}; . $replica_status->{"${source_name}_user"};
} }
if ( ($replica_status->{replica_io_state} || '') if ( ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for ${source_name} to send event' ) eq 'Waiting for source to send event' )
|| ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for master to send event' ) )
{ {
my ( $source_log_name, $source_log_num ) my ( $source_log_name, $source_log_num )
= $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/; = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;

6
bin/pt-kill
View File

@@ -4302,8 +4302,10 @@ sub is_source_of {
. $replica_status->{"${source_name}_user"}; . $replica_status->{"${source_name}_user"};
} }
if ( ($replica_status->{replica_io_state} || '') if ( ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for ${source_name} to send event' ) eq 'Waiting for source to send event' )
|| ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for master to send event' ) )
{ {
my ( $source_log_name, $source_log_num ) my ( $source_log_name, $source_log_num )
= $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/; = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;

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

@@ -4590,8 +4590,10 @@ sub is_source_of {
. $replica_status->{"${source_name}_user"}; . $replica_status->{"${source_name}_user"};
} }
if ( ($replica_status->{replica_io_state} || '') if ( ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for ${source_name} to send event' ) eq 'Waiting for source to send event' )
|| ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for master to send event' ) )
{ {
my ( $source_log_name, $source_log_num ) my ( $source_log_name, $source_log_num )
= $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/; = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;

6
bin/pt-query-digest
View File

@@ -10896,8 +10896,10 @@ sub is_source_of {
. $replica_status->{"${source_name}_user"}; . $replica_status->{"${source_name}_user"};
} }
if ( ($replica_status->{replica_io_state} || '') if ( ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for ${source_name} to send event' ) eq 'Waiting for source to send event' )
|| ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for master to send event' ) )
{ {
my ( $source_log_name, $source_log_num ) my ( $source_log_name, $source_log_num )
= $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/; = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;

6
bin/pt-replica-find
View File

@@ -2627,8 +2627,10 @@ sub is_source_of {
. $replica_status->{"${source_name}_user"}; . $replica_status->{"${source_name}_user"};
} }
if ( ($replica_status->{replica_io_state} || '') if ( ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for ${source_name} to send event' ) eq 'Waiting for source to send event' )
|| ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for master to send event' ) )
{ {
my ( $source_log_name, $source_log_num ) my ( $source_log_name, $source_log_num )
= $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/; = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;

6
bin/pt-replica-restart
View File

@@ -3038,8 +3038,10 @@ sub is_source_of {
. $replica_status->{"${source_name}_user"}; . $replica_status->{"${source_name}_user"};
} }
if ( ($replica_status->{replica_io_state} || '') if ( ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for ${source_name} to send event' ) eq 'Waiting for source to send event' )
|| ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for master to send event' ) )
{ {
my ( $source_log_name, $source_log_num ) my ( $source_log_name, $source_log_num )
= $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/; = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;

6
bin/pt-table-checksum
View File

@@ -5545,8 +5545,10 @@ sub is_source_of {
. $replica_status->{"${source_name}_user"}; . $replica_status->{"${source_name}_user"};
} }
if ( ($replica_status->{replica_io_state} || '') if ( ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for ${source_name} to send event' ) eq 'Waiting for source to send event' )
|| ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for master to send event' ) )
{ {
my ( $source_log_name, $source_log_num ) my ( $source_log_name, $source_log_num )
= $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/; = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;

6
bin/pt-table-sync
View File

@@ -7057,9 +7057,9 @@ sub is_source_of {
} }
if ( ( ($replica_status->{replica_io_state} || '') if ( ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for source to send event' ) eq 'Waiting for source to send event' )
|| ( ($replica_status->{replica_io_state} || '') || ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for master to send event' ) ) eq 'Waiting for master to send event' ) )
{ {
my ( $source_log_name, $source_log_num ) my ( $source_log_name, $source_log_num )
= $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/; = $source_status->{file} =~ m/^(.*?)\.0*([1-9][0-9]*)$/;

6
lib/MasterSlave.pm
View File

@@ -453,8 +453,10 @@ sub is_source_of {
. $replica_status->{"${source_name}_user"}; . $replica_status->{"${source_name}_user"};
} }
if ( ($replica_status->{replica_io_state} || '') if ( ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for ${source_name} to send event' ) eq 'Waiting for source to send event' )
|| ( ($replica_status->{replica_io_state} || '')
eq 'Waiting for master to send event' ) )
{ {
# The replica thinks its I/O thread is caught up to the source. Let's # The replica thinks its I/O thread is caught up to the source. Let's
# compare and make sure the source and replica are reasonably close to each # compare and make sure the source and replica are reasonably close to each