Commit e86d7108 authored by Marko Mäkelä's avatar Marko Mäkelä

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.
parent 502f1a3c
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 # Test 1) Show the page size from Information Schema
SELECT variable_value FROM information_schema.global_status SELECT variable_value FROM information_schema.global_status
WHERE LOWER(variable_name) = 'innodb_page_size'; WHERE LOWER(variable_name) = 'innodb_page_size';
......
call mtr.add_suppression("Table .* has a primary key in InnoDB data dictionary, but not in 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, which is different from the number of indexes .* defined in the MariaDB.*"); call mtr.add_suppression("InnoDB: Table .* contains .* indexes inside InnoDB");
create table t1 (pk int, i int, key(i)) engine=InnoDB; create table t1 (pk int, i int, key(i)) engine=InnoDB;
insert into t1 values (1,1),(2,2); insert into t1 values (1,1),(2,2);
flush tables; flush tables;
......
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");
call mtr.add_suppression("Row size too large (> 8126)*");
CREATE TABLE t1 ( text1 TEXT, CREATE TABLE t1 ( text1 TEXT,
text2 TEXT, text2 TEXT,
text3 TEXT, text3 TEXT,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# Bug #17852083 PRINT A WARNING WHEN DDL HAS AN ERROR IN # Bug #17852083 PRINT A WARNING WHEN DDL HAS AN ERROR IN
# INNODB_STRICT_MODE = 1 # 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; set innodb_strict_mode = 0;
create table t1 (id int auto_increment primary key, create table t1 (id int auto_increment primary key,
v varchar(32), v varchar(32),
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_innodb_16k.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`; let $MYSQLD_DATADIR= `select @@datadir`;
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
--source include/not_embedded.inc --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("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("InnoDB: Table .* contains .* indexes inside InnoDB");
create table t1 (pk int, i int, key(i)) engine=InnoDB; create table t1 (pk int, i int, key(i)) engine=InnoDB;
insert into t1 values (1,1),(2,2); insert into t1 values (1,1),(2,2);
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
# MDEV-7513: ib_warn_row_too_big dereferences null thd # 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("InnoDB: Cannot add field .* in table");
call mtr.add_suppression("Row size too large (> 8126)*");
--disable_warnings --disable_warnings
CREATE TABLE t1 ( text1 TEXT, CREATE TABLE t1 ( text1 TEXT,
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
--echo # INNODB_STRICT_MODE = 1 --echo # INNODB_STRICT_MODE = 1
--echo # --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; set innodb_strict_mode = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment