diff options
| author | Rex <rex.johnston@mariadb.com> | 2023-01-06 15:03:54 +1200 |
|---|---|---|
| committer | Daniel Black <daniel@mariadb.org> | 2023-01-06 19:07:37 +1100 |
| commit | b075191ba8598af6aff5549e6e19f6255aef258a (patch) | |
| tree | 7a2163471bbad87c17eb8db93e2c87ef0de65312 /debian | |
| parent | c6e0ab74f02cb502bda0a6cce6901a5fd19c6b02 (diff) | |
| download | mariadb-git-b075191ba8598af6aff5549e6e19f6255aef258a.tar.gz | |
MDEV-30353 Debian additions version fix
fix up version detection in debian/additions/innotop
after 10->11
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/additions/innotop/innotop | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index 5d81980341d..1602c21e806 100644 --- a/debian/additions/innotop/innotop +++ b/debian/additions/innotop/innotop @@ -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 { |