mirror of
https://github.com/MariaDB/server.git
synced 2025-05-05 16:59:35 +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.)
66 lines
2.0 KiB
Plaintext
66 lines
2.0 KiB
Plaintext
call mtr.add_suppression("trying to do an operation on a dropped tablespace .*");
|
|
SET GLOBAL innodb_encrypt_tables = OFF;
|
|
SET GLOBAL innodb_encryption_threads = 4;
|
|
CREATE TABLE t1 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB;
|
|
SHOW CREATE TABLE t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`pk` int(11) NOT NULL AUTO_INCREMENT,
|
|
`c` varchar(256) DEFAULT NULL,
|
|
PRIMARY KEY (`pk`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
CREATE TABLE t2 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB ENCRYPTED=YES;
|
|
CREATE TABLE t3 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB ENCRYPTED=NO;
|
|
CREATE TABLE t4 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB ENCRYPTED=YES ENCRYPTION_KEY_ID=4;
|
|
INSERT INTO t2 select * from t1;
|
|
INSERT INTO t3 select * from t1;
|
|
INSERT INTO t4 select * from t1;
|
|
SET GLOBAL innodb_encrypt_tables = on;
|
|
# Wait max 10 min for key encryption threads to encrypt required all spaces
|
|
# Success!
|
|
SELECT COUNT(1) FROM t1;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t2;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t3;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t4;
|
|
COUNT(1)
|
|
400
|
|
SET GLOBAL innodb_encrypt_tables = off;
|
|
# Wait max 10 min for key encryption threads to decrypt all required spaces
|
|
# Success!
|
|
SET GLOBAL innodb_encrypt_tables = ON;
|
|
set GLOBAL innodb_default_encryption_key_id=4;
|
|
CREATE TABLE t5 (pk INT PRIMARY KEY AUTO_INCREMENT, c VARCHAR(256)) ENGINE=INNODB;
|
|
SHOW CREATE TABLE t5;
|
|
Table Create Table
|
|
t5 CREATE TABLE `t5` (
|
|
`pk` int(11) NOT NULL AUTO_INCREMENT,
|
|
`c` varchar(256) DEFAULT NULL,
|
|
PRIMARY KEY (`pk`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
INSERT INTO t5 select * from t1;
|
|
# Wait max 10 min for key encryption threads to encrypt required all spaces
|
|
# Success!
|
|
SELECT COUNT(1) FROM t1;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t2;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t3;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t4;
|
|
COUNT(1)
|
|
400
|
|
SELECT COUNT(1) FROM t5;
|
|
COUNT(1)
|
|
400
|
|
drop table t1,t2,t3,t4, t5;
|
|
set GLOBAL innodb_default_encryption_key_id=1;
|