database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

Do not use os_file_read() directly for reading first page of the

Browse Source 
tablespace. Instead use fil_read() with syncronous setting.
Fix test failures and mask tablespace number as it could
change in concurrent mtr runs.
This commit is contained in:
Jan Lindström
2016-09-22 20:57:15 +03:00
parent 2bedc3978b
commit 1d55cfce10
9 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/encryption/t/innodb-bad-key-change.test
View File

@@ -54,6 +54,7 @@ SELECT * FROM t1;
--error ER_GET_ERRMSG
SELECT * FROM t1;
--replace_regex /tablespace [0-9]*/tablespace /
SHOW WARNINGS;
-- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keysbad3.txt
@@ -79,7 +80,7 @@ INSERT INTO t2 VALUES ('foobar',1,2);
--error ER_GET_ERRMSG
SELECT * FROM t2;
--replace_regex /.*tablespace [0-9]*//
--replace_regex /tablespace [0-9]*/tablespace /
SHOW WARNINGS;
--error ER_GET_ERRMSG
SELECT * FROM t2 where id = 1;