mirror of
https://github.com/MariaDB/server.git
synced 2025-02-15 18:05:32 +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.)
39 lines
1.7 KiB
Text
39 lines
1.7 KiB
Text
--source include/have_innodb.inc
|
|
# embedded does not support restart
|
|
-- source include/not_embedded.inc
|
|
-- source filekeys_plugin_exists.inc
|
|
#
|
|
# MDEV-8769: Server crash at file btr0btr.ic line 122 when defragmenting encrypted table using incorrect keys
|
|
# MDEV-8768: Server crash at file btr0btr.ic line 122 when checking encrypted table using incorrect keys
|
|
#
|
|
|
|
call mtr.add_suppression("InnoDB: The page \\[page id: space=[1-9][0-9]*, page number=[1-9][0-9]*\\] in file '.*test.t1\\.ibd' cannot be decrypted\\.");
|
|
# Suppression for builds where file_key_management plugin is linked statically
|
|
call mtr.add_suppression("Couldn't load plugins from 'file_key_management");
|
|
|
|
--let $restart_parameters=--plugin-load-add=file_key_management.so --file-key-management --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 (pk INT PRIMARY KEY, f VARCHAR(8)) ENGINE=InnoDB
|
|
ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
|
|
INSERT INTO t1 VALUES (1,'foo'),(2,'bar');
|
|
|
|
--let $restart_parameters=--plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys3.txt
|
|
--source include/restart_mysqld.inc
|
|
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
OPTIMIZE TABLE t1;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
CHECK TABLE t1;
|
|
--replace_regex /(tablespace|key_id) [1-9][0-9]*/\1 /
|
|
SHOW WARNINGS;
|
|
|
|
--let $restart_parameters=--plugin-load-add=file_key_management.so --file-key-management --file-key-management-filename=$MYSQL_TEST_DIR/std_data/keys2.txt
|
|
--source include/restart_mysqld.inc
|
|
|
|
DROP TABLE t1;
|