database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge 10.0 into 10.1 (test-only changes)

Browse Source 
Adjust the 10.1 tests innodb.doublewrite and innodb.101_compatibility
in the same way.
This commit is contained in:
Marko Mäkelä
2017-01-27 16:14:20 +02:00
parent f1f8ebc325 4e82aaab2f
commit 1ebfeceeb2
11 changed files with 25 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/innodb/t/doublewrite.test
View File

@@ -10,8 +10,6 @@
# Slow shutdown and restart to make sure ibuf merge is finished
SET GLOBAL innodb_fast_shutdown = 0;
--source include/restart_mysqld.inc
--disable_query_log
call mtr.add_suppression("space header page consists of zero bytes.*test.t1");
call mtr.add_suppression("checksum mismatch in tablespace.*test.t1");
@@ -19,6 +17,7 @@ call mtr.add_suppression("Current page size .* != page size on page");
call mtr.add_suppression("innodb-page-size mismatch in tablespace.*test.t1");
call mtr.add_suppression("Trying to recover page.*from the doublewrite buffer");
--enable_query_log
--source include/restart_mysqld.inc
let INNODB_PAGE_SIZE=`select @@innodb_page_size`;
let MYSQLD_DATADIR=`select @@datadir`;