Skip to content

Commit

Permalink
Deb: Innotop: Add support for MariaDB 10.5+
Browse files Browse the repository at this point in the history
  • Loading branch information
ottok authored and grooverdan committed May 28, 2021
1 parent 08bc7ee commit a70a553
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions debian/additions/innotop/innotop
Original file line number Diff line number Diff line change
Expand Up @@ -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\.[012]\./) ) {
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[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 {
Expand Down Expand Up @@ -634,7 +634,7 @@ sub parse_fk_section {
return 0 unless $fulltext;

my ( $ts, $type );
if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10.[012]\./) ) {
if ( ($mysqlversion =~ /^5.[67]\./) || ($mysqlversion =~ /^10.[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 {
Expand Down Expand Up @@ -894,7 +894,7 @@ sub parse_dl_section {
my ( $ts ) = $fulltext =~ m/^$s$/m;
return 0 unless $ts;

if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[012]\./) ) {
if ( ($mysqlversion =~ /^5\.[67]\./) || ($mysqlversion =~ /^10\.[0-9]\./) ) {
$dl->{'ts'} = [ parse_innodb_timestamp_56( $ts ) ];
}
else {
Expand Down Expand Up @@ -12064,7 +12064,7 @@ This data is from the TRANSACTIONS section of SHOW INNODB STATUS.
=item IO_THREADS
This data is from the list of threads in the the FILE I/O section of SHOW INNODB
This data is from the list of threads in the FILE I/O section of SHOW INNODB
STATUS.
=item INNODB_LOCKS
Expand Down
2 changes: 1 addition & 1 deletion debian/additions/innotop/innotop.1
Original file line number Diff line number Diff line change
Expand Up @@ -2048,7 +2048,7 @@ the processlist.
This data is from the \s-1TRANSACTIONS\s0 section of \s-1SHOW INNODB STATUS.\s0
.IP "\s-1IO_THREADS\s0" 4
.IX Item "IO_THREADS"
This data is from the list of threads in the the \s-1FILE I/O\s0 section of \s-1SHOW INNODB
This data is from the list of threads in the \s-1FILE I/O\s0 section of \s-1SHOW INNODB
STATUS.\s0
.IP "\s-1INNODB_LOCKS\s0" 4
.IX Item "INNODB_LOCKS"
Expand Down

0 comments on commit a70a553

Please sign in to comment.