mirror of
https://github.com/MariaDB/server.git
synced 2025-01-26 00:34:18 +01:00
MDEV-30353 Debian additions version fix
fix up version detection in debian/additions/innotop after 10->11
This commit is contained in:
parent
c6e0ab74f0
commit
b075191ba8
1 changed files with 3 additions and 3 deletions
6
debian/additions/innotop/innotop
vendored
6
debian/additions/innotop/innotop
vendored
|
@ -466,7 +466,7 @@ sub parse_status_text {
|
|||
# too many locks to print, the output might be truncated)
|
||||
|
||||
my $time_text;
|
||||
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[0-9]\./) ) {
|
||||
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10|11\.[0-9]\./) ) {
|
||||
( $time_text ) = $fulltext =~ m/^([0-9-]* [0-9:]*) [0-9a-fx]* INNODB MONITOR OUTPUT/m;
|
||||
$innodb_data{'ts'} = [ parse_innodb_timestamp_56( $time_text ) ];
|
||||
} else {
|
||||
|
@ -634,7 +634,7 @@ sub parse_fk_section {
|
|||
return 0 unless $fulltext;
|
||||
|
||||
my ( $ts, $type );
|
||||
if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10.[0-9]\./) ) {
|
||||
if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10|11.[0-9]\./) ) {
|
||||
( $ts, $type ) = $fulltext =~ m/^([0-9-]* [0-9:]*)\s[0-9a-fx]*\s+(\w+)/m;
|
||||
$section->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
|
||||
} else {
|
||||
|
@ -894,7 +894,7 @@ sub parse_dl_section {
|
|||
my ( $ts ) = $fulltext =~ m/^$s$/m;
|
||||
return 0 unless $ts;
|
||||
|
||||
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[0-9]\./) ) {
|
||||
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10|11\.[0-9]\./) ) {
|
||||
$dl->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
|
||||
}
|
||||
else {
|
||||
|
|
Loading…
Add table
Reference in a new issue