mirror of
https://github.com/MariaDB/server.git
synced 2025-05-01 08:45:04 +03:00
069d0472b3
The issue was a bad merge of MDEV-12253 from 10.1 to 10.2 in commit f9cc391863ab962e8c8a8a8a676d730498eb8d6f. 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.)
18 lines
650 B
C++
18 lines
650 B
C++
-- source include/not_embedded.inc
|
|
-- source include/have_innodb.inc
|
|
-- source filekeys_plugin.inc
|
|
|
|
--eval call mtr.add_suppression("$SEARCH_PATTERN")
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
|
|
--let SEARCH_FILE= $MYSQLTEST_VARDIR/log/mysqld.1.err
|
|
--source include/search_pattern_in_file.inc
|
|
|
|
--error ER_CANT_CREATE_TABLE
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
|