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.)
22 lines
548 B
Plaintext
22 lines
548 B
Plaintext
#
|
|
# MDEV-8021 "InnoDB: Tablespace id 4 encrypted but encryption service not available. Can't continue opening tablespace" on server restart when there are encrypted tables
|
|
#
|
|
|
|
--source include/have_innodb.inc
|
|
--source include/have_file_key_management_plugin.inc
|
|
|
|
let $datadir=`select @@datadir`;
|
|
--source include/shutdown_mysqld.inc
|
|
|
|
--remove_file $datadir/ib_logfile0
|
|
--remove_file $datadir/ib_logfile1
|
|
--remove_file $datadir/ibdata1
|
|
|
|
--source include/start_mysqld.inc
|
|
|
|
create table t1 (a int);
|
|
|
|
--source include/restart_mysqld.inc
|
|
|
|
drop table t1;
|