diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 11:39:38 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-06-01 11:39:38 +0300 |
| commit | a722ee88f33296eee6a72855570677c48dce7ebf (patch) | |
| tree | 128ce4696a80fd953836b4a9eed20ab8afc4e61c /debian | |
| parent | 5727d56260e66d9b9f2dee6783385c5928d4f3a3 (diff) | |
| parent | 9c7a456a92262bdb44b85a05aa9f87369c5b063c (diff) | |
| download | mariadb-git-a722ee88f33296eee6a72855570677c48dce7ebf.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/additions/innotop/innotop | 8 | ||||
| -rw-r--r-- | debian/additions/innotop/innotop.1 | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop index f1648f4ce60..5d81980341d 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\.[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 { @@ -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 { @@ -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 { @@ -12065,7 +12065,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 diff --git a/debian/additions/innotop/innotop.1 b/debian/additions/innotop/innotop.1 index 65da5dc0dfb..62a9aed69ee 100644 --- a/debian/additions/innotop/innotop.1 +++ b/debian/additions/innotop/innotop.1 @@ -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" |