mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Shorten some add_suppression

Browse source 
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.
This commit is contained in:
Marko Mäkelä 2018-07-02 12:14:19 +03:00
parent 502f1a3c11
commit e86d7108a2
8 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/innodb/r/innodb-16k.result
View file

@ -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';

4
mysql-test/suite/innodb/r/innodb-corrupted-table.result
View file

@ -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;

3
mysql-test/suite/innodb/r/innodb-mdev-7513.result
View file

@ -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,

2
mysql-test/suite/innodb/r/strict_mode.result
View file

@ -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),

2
mysql-test/suite/innodb/t/innodb-16k.test
View file

@ -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`;

6
mysql-test/suite/innodb/t/innodb-corrupted-table.test
View file

@ -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);

3
mysql-test/suite/innodb/t/innodb-mdev-7513.test
View file

@ -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,

2
mysql-test/suite/innodb/t/strict_mode.test
View file

@ -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;