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

Adjust tests after commit b5615eff

parent ea5cda52
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
-- source include/have_innodb.inc -- 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: 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: 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."); call mtr.add_suppression("InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them.");
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
# Test Restart & Crash Recovery. # Test Restart & Crash Recovery.
-- source include/big_test.inc -- source include/big_test.inc
-- source include/innodb_page_size_small.inc -- source include/innodb_page_size_small.inc
let $restart_noprint=2;
# Test Row Format: REDUNDANT. # Test Row Format: REDUNDANT.
let $row_format = REDUNDANT; let $row_format = REDUNDANT;
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
# is independent of the page size. # is independent of the page size.
--source include/have_innodb_16k.inc --source include/have_innodb_16k.inc
let $restart_noprint=2;
SET GLOBAL innodb_page_cleaner_disabled_debug = 1; SET GLOBAL innodb_page_cleaner_disabled_debug = 1;
SET GLOBAL innodb_dict_stats_disabled_debug = 1; SET GLOBAL innodb_dict_stats_disabled_debug = 1;
SET GLOBAL innodb_master_thread_disabled_debug = 1; SET GLOBAL innodb_master_thread_disabled_debug = 1;
......
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/have_debug.inc --source include/have_debug.inc
--source include/big_test.inc --source include/big_test.inc
let $restart_noprint=2;
--echo # --echo #
--echo # Bug Bug #27304661 MYSQL CRASH DOING SYNC INDEX ] --echo # Bug Bug #27304661 MYSQL CRASH DOING SYNC INDEX ]
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
--source include/have_innodb.inc --source include/have_innodb.inc
--source include/big_test.inc --source include/big_test.inc
let $restart_noprint=2;
# Create table with R-tree index. # Create table with R-tree index.
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb; create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
--source include/big_test.inc --source include/big_test.inc
# Valgrind takes too much time on PB2 even in the --big-test runs. # Valgrind takes too much time on PB2 even in the --big-test runs.
--source include/not_valgrind.inc --source include/not_valgrind.inc
let $restart_noprint=2;
SET GLOBAL innodb_file_per_table=1; SET GLOBAL innodb_file_per_table=1;
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
--source include/big_test.inc --source include/big_test.inc
--source include/not_valgrind.inc --source include/not_valgrind.inc
--source include/have_debug.inc --source include/have_debug.inc
let $restart_noprint=2;
# Create table with R-tree index. # Create table with R-tree index.
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb; create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb;
......
...@@ -18,6 +18,7 @@ call mtr.add_suppression("\\[Warning\\] InnoDB: Difficult to find free blocks in ...@@ -18,6 +18,7 @@ call mtr.add_suppression("\\[Warning\\] InnoDB: Difficult to find free blocks in
let MYSQLD_BASEDIR= `SELECT @@basedir`; let MYSQLD_BASEDIR= `SELECT @@basedir`;
let MYSQLD_DATADIR= `SELECT @@datadir`; let MYSQLD_DATADIR= `SELECT @@datadir`;
let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err; let SEARCH_FILE= $MYSQLTEST_VARDIR/log/my_restart.err;
let $restart_noprint=2;
SET GLOBAL innodb_compression_level=0; SET GLOBAL innodb_compression_level=0;
SELECT @@innodb_compression_level; SELECT @@innodb_compression_level;
......
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