summaryrefslogtreecommitdiffstats
path: root/debian/additions
diff options
context:
space:
mode:
Diffstat (limited to 'debian/additions')
-rwxr-xr-xdebian/additions/debian-start.inc.sh4
-rwxr-xr-xdebian/additions/innotop/innotop6
2 files changed, 5 insertions, 5 deletions
diff --git a/debian/additions/debian-start.inc.sh b/debian/additions/debian-start.inc.sh
index 57050057..f6929f7c 100755
--- a/debian/additions/debian-start.inc.sh
+++ b/debian/additions/debian-start.inc.sh
@@ -36,8 +36,8 @@ function check_for_crashed_tables() {
SELECT CONCAT("select count(*) into @discard from '\''", TABLE_SCHEMA, "'\''.'\''", TABLE_NAME, "'\''")
FROM information_schema.TABLES WHERE TABLE_SCHEMA<>"INFORMATION_SCHEMA" AND TABLE_SCHEMA<>"PERFORMANCE_SCHEMA"
AND (ENGINE="MyISAM" OR ENGINE="Aria")
- ' | \
- $MARIADB --skip-column-names --batch | \
+ ' |
+ $MARIADB --skip-column-names --batch |
xargs -i $MARIADB --skip-column-names --silent --batch --force -e "{}" &> "${tempfile}"
set -e
diff --git a/debian/additions/innotop/innotop b/debian/additions/innotop/innotop
index 6d5595ec..e0de8cce 100755
--- a/debian/additions/innotop/innotop
+++ b/debian/additions/innotop/innotop
@@ -469,7 +469,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 {
@@ -640,7 +640,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 {
@@ -901,7 +901,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 {