From e86d7108a2981b463c9724cb5a271efda5a87ea2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Mon, 2 Jul 2018 12:14:19 +0300 Subject: [PATCH] Shorten some add_suppression For some reason, some of these suppressions would fail to suppress when the code is compiled with clang 6.0, Debug and -DWITH_ASAN=ON. Possibly it is related to the number of .* or the length of the regular expression strings. --- mysql-test/suite/innodb/r/innodb-16k.result | 2 +- mysql-test/suite/innodb/r/innodb-corrupted-table.result | 4 ++-- mysql-test/suite/innodb/r/innodb-mdev-7513.result | 3 +-- mysql-test/suite/innodb/r/strict_mode.result | 2 +- mysql-test/suite/innodb/t/innodb-16k.test | 2 +- mysql-test/suite/innodb/t/innodb-corrupted-table.test | 6 +++--- mysql-test/suite/innodb/t/innodb-mdev-7513.test | 3 +-- mysql-test/suite/innodb/t/strict_mode.test | 2 +- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/mysql-test/suite/innodb/r/innodb-16k.result b/mysql-test/suite/innodb/r/innodb-16k.result index 07b40269e8f..b99aba15f0f 100644 --- a/mysql-test/suite/innodb/r/innodb-16k.result +++ b/mysql-test/suite/innodb/r/innodb-16k.result @@ -1,4 +1,4 @@ -call mtr.add_suppression("InnoDB: Cannot add field .* in table .* because after adding it, the row size is .* which is greater than maximum allowed size (.*) for a record on index leaf page."); +call mtr.add_suppression("InnoDB: Cannot add field .* in table"); # Test 1) Show the page size from Information Schema SELECT variable_value FROM information_schema.global_status WHERE LOWER(variable_name) = 'innodb_page_size'; diff --git a/mysql-test/suite/innodb/r/innodb-corrupted-table.result b/mysql-test/suite/innodb/r/innodb-corrupted-table.result index 1a8cea06c4c..9a0b3d81810 100644 --- a/mysql-test/suite/innodb/r/innodb-corrupted-table.result +++ b/mysql-test/suite/innodb/r/innodb-corrupted-table.result @@ -1,5 +1,5 @@ -call mtr.add_suppression("Table .* has a primary key in InnoDB data dictionary, but not in MariaDB.*"); -call mtr.add_suppression("InnoDB: Table .* contains .* indexes inside InnoDB, which is different from the number of indexes .* defined in the MariaDB.*"); +call mtr.add_suppression("Table .* has a primary key in InnoDB data dictionary, but not in MariaDB"); +call mtr.add_suppression("InnoDB: Table .* contains .* indexes inside InnoDB"); create table t1 (pk int, i int, key(i)) engine=InnoDB; insert into t1 values (1,1),(2,2); flush tables; diff --git a/mysql-test/suite/innodb/r/innodb-mdev-7513.result b/mysql-test/suite/innodb/r/innodb-mdev-7513.result index 55b4d3462b0..2ef54911cf1 100644 --- a/mysql-test/suite/innodb/r/innodb-mdev-7513.result +++ b/mysql-test/suite/innodb/r/innodb-mdev-7513.result @@ -1,5 +1,4 @@ -call mtr.add_suppression("InnoDB: Cannot add field `.* in table .* because after adding it, the row size is .* which is greater than maximum allowed size (.*) for a record on index leaf page."); -call mtr.add_suppression("Row size too large (> 8126)*"); +call mtr.add_suppression("InnoDB: Cannot add field .* in table"); CREATE TABLE t1 ( text1 TEXT, text2 TEXT, text3 TEXT, diff --git a/mysql-test/suite/innodb/r/strict_mode.result b/mysql-test/suite/innodb/r/strict_mode.result index 2f120afbc09..33afae708b4 100644 --- a/mysql-test/suite/innodb/r/strict_mode.result +++ b/mysql-test/suite/innodb/r/strict_mode.result @@ -2,7 +2,7 @@ # Bug #17852083 PRINT A WARNING WHEN DDL HAS AN ERROR IN # INNODB_STRICT_MODE = 1 # -call mtr.add_suppression("InnoDB: Cannot add field .* in table .* because after adding it, the row size is .* which is greater than maximum allowed size (.*) for a record on index leaf page."); +call mtr.add_suppression("InnoDB: Cannot add field .* in table"); set innodb_strict_mode = 0; create table t1 (id int auto_increment primary key, v varchar(32), diff --git a/mysql-test/suite/innodb/t/innodb-16k.test b/mysql-test/suite/innodb/t/innodb-16k.test index a3a92bdec6a..d83351ea7bf 100644 --- a/mysql-test/suite/innodb/t/innodb-16k.test +++ b/mysql-test/suite/innodb/t/innodb-16k.test @@ -3,7 +3,7 @@ --source include/have_innodb.inc --source include/have_innodb_16k.inc -call mtr.add_suppression("InnoDB: Cannot add field .* in table .* because after adding it, the row size is .* which is greater than maximum allowed size (.*) for a record on index leaf page."); +call mtr.add_suppression("InnoDB: Cannot add field .* in table"); let $MYSQLD_DATADIR= `select @@datadir`; diff --git a/mysql-test/suite/innodb/t/innodb-corrupted-table.test b/mysql-test/suite/innodb/t/innodb-corrupted-table.test index 60da461a33c..5d8e2bd1eda 100644 --- a/mysql-test/suite/innodb/t/innodb-corrupted-table.test +++ b/mysql-test/suite/innodb/t/innodb-corrupted-table.test @@ -2,11 +2,11 @@ --source include/not_embedded.inc # -# MDEV-9918: [ERROR] mysqld got signal 11 during ALTER TABLE `name` COLUMN ADD +# MDEV-9918: [ERROR] mysqld got signal 11 during ALTER TABLE `name` COLUMN ADD # -call mtr.add_suppression("Table .* has a primary key in InnoDB data dictionary, but not in MariaDB.*"); -call mtr.add_suppression("InnoDB: Table .* contains .* indexes inside InnoDB, which is different from the number of indexes .* defined in the MariaDB.*"); +call mtr.add_suppression("Table .* has a primary key in InnoDB data dictionary, but not in MariaDB"); +call mtr.add_suppression("InnoDB: Table .* contains .* indexes inside InnoDB"); create table t1 (pk int, i int, key(i)) engine=InnoDB; insert into t1 values (1,1),(2,2); diff --git a/mysql-test/suite/innodb/t/innodb-mdev-7513.test b/mysql-test/suite/innodb/t/innodb-mdev-7513.test index 88f941ef70d..c0e16b9e9d2 100644 --- a/mysql-test/suite/innodb/t/innodb-mdev-7513.test +++ b/mysql-test/suite/innodb/t/innodb-mdev-7513.test @@ -3,8 +3,7 @@ # MDEV-7513: ib_warn_row_too_big dereferences null thd -call mtr.add_suppression("InnoDB: Cannot add field `.* in table .* because after adding it, the row size is .* which is greater than maximum allowed size (.*) for a record on index leaf page."); -call mtr.add_suppression("Row size too large (> 8126)*"); +call mtr.add_suppression("InnoDB: Cannot add field .* in table"); --disable_warnings CREATE TABLE t1 ( text1 TEXT, diff --git a/mysql-test/suite/innodb/t/strict_mode.test b/mysql-test/suite/innodb/t/strict_mode.test index 48fc1ef7881..e93b4cc9df9 100644 --- a/mysql-test/suite/innodb/t/strict_mode.test +++ b/mysql-test/suite/innodb/t/strict_mode.test @@ -5,7 +5,7 @@ --echo # INNODB_STRICT_MODE = 1 --echo # -call mtr.add_suppression("InnoDB: Cannot add field .* in table .* because after adding it, the row size is .* which is greater than maximum allowed size (.*) for a record on index leaf page."); +call mtr.add_suppression("InnoDB: Cannot add field .* in table"); set innodb_strict_mode = 0;