mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +01:00
069d0472b3
The issue was a bad merge of MDEV-12253 from 10.1 to 10.2
in commit f9cc391863.
In that merge, I wrongly assumed that all test file conflicts
for mysql-test/suite/encryption had been properly resolved in
bb-10.2-MDEV-12253 (commit 76aa6be77635c7017459ce33b41c837c9acb606d)
while in fact, some files there had been copied from the 10.1 branch.
This commit is based on a manually done conflict resolution of
the mysql-test/suite/encryption on the same merge, applied to
the current 10.2 branch.
As part of this commit, the test encryption.innodb-bad-key-change4
which was shortly disabled due to MDEV-11336 will be re-enabled again.
(While the test enables innodb_defragment, it does not fail even though
enabling innodb_defragment currently has no effect.)
117 lines
3.9 KiB
Text
117 lines
3.9 KiB
Text
-- source include/have_innodb.inc
|
|
-- source include/have_file_key_management_plugin.inc
|
|
# embedded does not support restart
|
|
-- source include/not_embedded.inc
|
|
|
|
#
|
|
# MDEV-8588: Assertion failure in file ha_innodb.cc line 21140 if at least one encrypted
|
|
# table exists and encryption service is not available.
|
|
#
|
|
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t[12]\\.ibd' cannot be decrypted\\.");
|
|
call mtr.add_suppression("File '.*mysql-test.std_data.keysbad3\\.txt' not found");
|
|
|
|
--echo # Start server with keys2.txt
|
|
-- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
|
|
-- source include/restart_mysqld.inc
|
|
|
|
SET GLOBAL innodb_file_per_table = ON;
|
|
|
|
CREATE TABLE t1 (c VARCHAR(8)) ENGINE=InnoDB ENCRYPTED=YES ENCRYPTION_KEY_ID=2;
|
|
INSERT INTO t1 VALUES ('foobar');
|
|
ALTER TABLE t1 ADD COLUMN c2 INT;
|
|
INSERT INTO t1 VALUES ('foobar',2);
|
|
SELECT * FROM t1;
|
|
TRUNCATE TABLE t1;
|
|
SELECT * FROM t1;
|
|
INSERT INTO t1 VALUES ('foobar',1);
|
|
INSERT INTO t1 VALUES ('foobar',2);
|
|
FLUSH TABLE WITH READ LOCK;
|
|
SELECT * FROM t1;
|
|
|
|
--echo
|
|
--echo # Restart server with keysbad3.txt
|
|
-- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keysbad3.txt
|
|
-- source include/restart_mysqld.inc
|
|
|
|
--error ER_GET_ERRMSG
|
|
SELECT * FROM t1;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
|
|
-- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keysbad3.txt
|
|
-- source include/restart_mysqld.inc
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
DROP TABLE t1;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
|
|
#
|
|
# MDEV-8591: Database page corruption on disk or a failed space, Assertion failure in file buf0buf.cc
|
|
# line 2856 on querying a table using wrong default encryption key
|
|
#
|
|
|
|
--echo # Start server with keys3.txt
|
|
-- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys3.txt
|
|
-- source include/restart_mysqld.inc
|
|
|
|
SET GLOBAL innodb_default_encryption_key_id=5;
|
|
CREATE TABLE t2 (c VARCHAR(8), id int not null primary key, b int, key(b)) ENGINE=InnoDB ENCRYPTED=YES;
|
|
INSERT INTO t2 VALUES ('foobar',1,2);
|
|
|
|
--echo
|
|
--echo # Restart server with keys2.txt
|
|
-- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
|
|
-- source include/restart_mysqld.inc
|
|
|
|
--error ER_GET_ERRMSG
|
|
SELECT * FROM t2;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
--error ER_GET_ERRMSG
|
|
SELECT * FROM t2 where id = 1;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
--error ER_GET_ERRMSG
|
|
SELECT * FROM t2 where b = 1;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
--error ER_GET_ERRMSG
|
|
INSERT INTO t2 VALUES ('tmp',3,3);
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
--error ER_GET_ERRMSG
|
|
DELETE FROM t2 where b = 3;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
--error ER_GET_ERRMSG
|
|
DELETE FROM t2 where id = 3;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
--error ER_GET_ERRMSG
|
|
UPDATE t2 set b = b +1;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
OPTIMIZE TABLE t2;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
--error ER_GET_ERRMSG
|
|
ALTER TABLE t2 ADD COLUMN d INT;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
ANALYZE TABLE t2;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
--error ER_GET_ERRMSG
|
|
TRUNCATE TABLE t2;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
|
|
DROP TABLE t2;
|
|
|
|
--echo
|
|
--echo # Start server with keys2.txt
|
|
-- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
|
|
-- source include/restart_mysqld.inc
|