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.
MariaDB · Jul 2, 2018 · e86d710 · e86d710
1 parent 502f1a3
commit e86d710
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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;