Skip to content

Commit a70a553

Browse files
ottokgrooverdan
authored andcommitted
Deb: Innotop: Add support for MariaDB 10.5+
Synced from downstream Debian: https://salsa.debian.org/mariadb-team/mariadb-10.5/-/commit/7015e8e4b5ed3a7727a8e442039fceb2c5b1a6b9
1 parent 08bc7ee commit a70a553

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

debian/additions/innotop/innotop

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,7 @@ sub parse_status_text {
466466
# too many locks to print, the output might be truncated)
467467

468468
my $time_text;
469-
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[012]\./) ) {
469+
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[0-9]\./) ) {
470470
( $time_text ) = $fulltext =~ m/^([0-9-]* [0-9:]*) [0-9a-fx]* INNODB MONITOR OUTPUT/m;
471471
$innodb_data{'ts'} = [ parse_innodb_timestamp_56( $time_text ) ];
472472
} else {
@@ -634,7 +634,7 @@ sub parse_fk_section {
634634
return 0 unless $fulltext;
635635

636636
my ( $ts, $type );
637-
if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10.[012]\./) ) {
637+
if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10.[0-9]\./) ) {
638638
( $ts, $type ) = $fulltext =~ m/^([0-9-]* [0-9:]*)\s[0-9a-fx]*\s+(\w+)/m;
639639
$section->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
640640
} else {
@@ -894,7 +894,7 @@ sub parse_dl_section {
894894
my ( $ts ) = $fulltext =~ m/^$s$/m;
895895
return 0 unless $ts;
896896

897-
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[012]\./) ) {
897+
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[0-9]\./) ) {
898898
$dl->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
899899
}
900900
else {
@@ -12064,7 +12064,7 @@ This data is from the TRANSACTIONS section of SHOW INNODB STATUS.
1206412064
1206512065
=item IO_THREADS
1206612066
12067-
This data is from the list of threads in the the FILE I/O section of SHOW INNODB
12067+
This data is from the list of threads in the FILE I/O section of SHOW INNODB
1206812068
STATUS.
1206912069
1207012070
=item INNODB_LOCKS

debian/additions/innotop/innotop.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2048,7 +2048,7 @@ the processlist.
20482048
This data is from the \s-1TRANSACTIONS\s0 section of \s-1SHOW INNODB STATUS.\s0
20492049
.IP "\s-1IO_THREADS\s0" 4
20502050
.IX Item "IO_THREADS"
2051-
This data is from the list of threads in the the \s-1FILE I/O\s0 section of \s-1SHOW INNODB
2051+
This data is from the list of threads in the \s-1FILE I/O\s0 section of \s-1SHOW INNODB
20522052
STATUS.\s0
20532053
.IP "\s-1INNODB_LOCKS\s0" 4
20542054
.IX Item "INNODB_LOCKS"

0 commit comments

Comments
 (0)