From 517486963b3c2d059df1c3537baf000e77eb0196 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Tue, 2 Apr 2019 11:01:27 +0300 Subject: [PATCH] Adjust tests after commit b5615eff0d00cfb4c60b9d1bf67094da7c2258a6 --- mysql-test/suite/innodb/t/innodb-wl5522-debug.test | 1 + mysql-test/suite/innodb/t/innodb_bulk_create_index_debug.test | 1 + mysql-test/suite/innodb/t/redo_log_during_checkpoint.test | 1 + mysql-test/suite/innodb_fts/t/fulltext_table_evict.test | 1 + mysql-test/suite/innodb_gis/t/kill_server.test | 1 + mysql-test/suite/innodb_gis/t/rtree_compress2.test | 1 + mysql-test/suite/innodb_gis/t/rtree_split.test | 1 + mysql-test/suite/innodb_zip/t/innochecksum_2.test | 1 + 8 files changed, 8 insertions(+) diff --git a/mysql-test/suite/innodb/t/innodb-wl5522-debug.test b/mysql-test/suite/innodb/t/innodb-wl5522-debug.test index 15f8544088d..fb0fe8fccd1 100644 --- a/mysql-test/suite/innodb/t/innodb-wl5522-debug.test +++ b/mysql-test/suite/innodb/t/innodb-wl5522-debug.test @@ -15,6 +15,7 @@ -- source include/have_innodb.inc +let $restart_noprint=2; call mtr.add_suppression("InnoDB: Operating system error number .* in a file operation."); call mtr.add_suppression("InnoDB: The error means the system cannot find the path specified."); call mtr.add_suppression("InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them."); diff --git a/mysql-test/suite/innodb/t/innodb_bulk_create_index_debug.test b/mysql-test/suite/innodb/t/innodb_bulk_create_index_debug.test index 83a12431802..34c9336e517 100644 --- a/mysql-test/suite/innodb/t/innodb_bulk_create_index_debug.test +++ b/mysql-test/suite/innodb/t/innodb_bulk_create_index_debug.test @@ -5,6 +5,7 @@ # Test Restart & Crash Recovery. -- source include/big_test.inc -- source include/innodb_page_size_small.inc +let $restart_noprint=2; # Test Row Format: REDUNDANT. let $row_format = REDUNDANT; diff --git a/mysql-test/suite/innodb/t/redo_log_during_checkpoint.test b/mysql-test/suite/innodb/t/redo_log_during_checkpoint.test index 9ff01739f60..21c3c72da1c 100644 --- a/mysql-test/suite/innodb/t/redo_log_during_checkpoint.test +++ b/mysql-test/suite/innodb/t/redo_log_during_checkpoint.test @@ -12,6 +12,7 @@ # is independent of the page size. --source include/have_innodb_16k.inc +let $restart_noprint=2; SET GLOBAL innodb_page_cleaner_disabled_debug = 1; SET GLOBAL innodb_dict_stats_disabled_debug = 1; SET GLOBAL innodb_master_thread_disabled_debug = 1; diff --git a/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test b/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test index 2e7aa655aa1..18bce1a8105 100644 --- a/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test +++ b/mysql-test/suite/innodb_fts/t/fulltext_table_evict.test @@ -1,6 +1,7 @@ --source include/have_innodb.inc --source include/have_debug.inc --source include/big_test.inc +let $restart_noprint=2; --echo # --echo # Bug Bug #27304661 MYSQL CRASH DOING SYNC INDEX ] diff --git a/mysql-test/suite/innodb_gis/t/kill_server.test b/mysql-test/suite/innodb_gis/t/kill_server.test index 028bbbdd40d..d6657c74bcc 100644 --- a/mysql-test/suite/innodb_gis/t/kill_server.test +++ b/mysql-test/suite/innodb_gis/t/kill_server.test @@ -6,6 +6,7 @@ --source include/have_innodb.inc --source include/big_test.inc +let $restart_noprint=2; # Create table with R-tree index. create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb; diff --git a/mysql-test/suite/innodb_gis/t/rtree_compress2.test b/mysql-test/suite/innodb_gis/t/rtree_compress2.test index c02a6ff0ed4..95be8b8f357 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_compress2.test +++ b/mysql-test/suite/innodb_gis/t/rtree_compress2.test @@ -8,6 +8,7 @@ --source include/big_test.inc # Valgrind takes too much time on PB2 even in the --big-test runs. --source include/not_valgrind.inc +let $restart_noprint=2; SET GLOBAL innodb_file_per_table=1; diff --git a/mysql-test/suite/innodb_gis/t/rtree_split.test b/mysql-test/suite/innodb_gis/t/rtree_split.test index caf79becbd0..856fb485234 100644 --- a/mysql-test/suite/innodb_gis/t/rtree_split.test +++ b/mysql-test/suite/innodb_gis/t/rtree_split.test @@ -8,6 +8,7 @@ --source include/big_test.inc --source include/not_valgrind.inc --source include/have_debug.inc +let $restart_noprint=2; # Create table with R-tree index. create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb; diff --git a/mysql-test/suite/innodb_zip/t/innochecksum_2.test b/mysql-test/suite/innodb_zip/t/innochecksum_2.test index 330bb81ba75..1efe653cd1a 100644 --- a/mysql-test/suite/innodb_zip/t/innochecksum_2.test +++ b/mysql-test/suite/innodb_zip/t/innochecksum_2.test @@ -18,6 +18,7 @@ call mtr.add_suppression("\\[Warning\\] InnoDB: Difficult to find free blocks in let MYSQLD_BASEDIR= `SELECT @@basedir`; let MYSQLD_DATADIR= `SELECT @@datadir`; let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err; +let $restart_noprint=2; SET GLOBAL innodb_compression_level=0; SELECT @@innodb_compression_level;