mirror of
https://github.com/MariaDB/server.git
synced 2025-05-07 04:01:59 +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.)
121 lines
3.1 KiB
Plaintext
121 lines
3.1 KiB
Plaintext
CREATE TABLE t1 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB encrypted=yes;
|
|
CREATE TABLE t2 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB;
|
|
CREATE TABLE t3 (id INT NOT NULL PRIMARY KEY, a VARCHAR(255)) ENGINE=InnoDB row_format=compressed encrypted=yes;
|
|
create procedure innodb_insert_proc (repeat_count int)
|
|
begin
|
|
declare current_num int;
|
|
set current_num = 0;
|
|
while current_num < repeat_count do
|
|
insert into t1 values (current_num,repeat('foobar',42));
|
|
insert into t2 values (current_num,repeat('temp', 42));
|
|
insert into t3 values (current_num,repeat('barfoo',42));
|
|
set current_num = current_num + 1;
|
|
end while;
|
|
end//
|
|
commit;
|
|
set autocommit=0;
|
|
call innodb_insert_proc(10000);
|
|
commit;
|
|
set autocommit=1;
|
|
# Wait max 10 min for key encryption threads to encrypt all spaces
|
|
# tablespaces should be now encrypted
|
|
# t1 yes on expecting NOT FOUND
|
|
NOT FOUND /foobar/ in t1.ibd
|
|
# t2 ... on expecting NOT FOUND
|
|
NOT FOUND /temp/ in t2.ibd
|
|
# t3 ... on expecting NOT FOUND
|
|
NOT FOUND /barfoo/ in t3.ibd
|
|
t1.frm
|
|
t1.ibd
|
|
t2.frm
|
|
t2.ibd
|
|
t3.frm
|
|
t3.ibd
|
|
FLUSH TABLES t1, t2, t3 FOR EXPORT;
|
|
backup: t1
|
|
backup: t2
|
|
backup: t3
|
|
t1.cfg
|
|
t1.frm
|
|
t1.ibd
|
|
t2.cfg
|
|
t2.frm
|
|
t2.ibd
|
|
t3.cfg
|
|
t3.frm
|
|
t3.ibd
|
|
UNLOCK TABLES;
|
|
ALTER TABLE t1 DISCARD TABLESPACE;
|
|
ALTER TABLE t2 DISCARD TABLESPACE;
|
|
ALTER TABLE t3 DISCARD TABLESPACE;
|
|
restore: t1 .ibd and .cfg files
|
|
restore: t2 .ibd and .cfg files
|
|
restore: t3 .ibd and .cfg files
|
|
ALTER TABLE t1 IMPORT TABLESPACE;
|
|
SELECT COUNT(1) FROM t1;
|
|
COUNT(1)
|
|
10000
|
|
ALTER TABLE t2 IMPORT TABLESPACE;
|
|
SELECT COUNT(1) FROM t2;
|
|
COUNT(1)
|
|
10000
|
|
ALTER TABLE t3 IMPORT TABLESPACE;
|
|
SELECT COUNT(1) FROM t3;
|
|
COUNT(1)
|
|
10000
|
|
# tablespaces should remain encrypted after import
|
|
# t1 yes on expecting NOT FOUND
|
|
NOT FOUND /foobar/ in t1.ibd
|
|
# t2 ... on expecting NOT FOUND
|
|
NOT FOUND /temp/ in t2.ibd
|
|
# t3 ... on expecting NOT FOUND
|
|
NOT FOUND /barfoo/ in t3.ibd
|
|
ALTER TABLE t1 ENGINE InnoDB;
|
|
SHOW CREATE TABLE t1;
|
|
Table Create Table
|
|
t1 CREATE TABLE `t1` (
|
|
`id` int(11) NOT NULL,
|
|
`a` varchar(255) DEFAULT NULL,
|
|
PRIMARY KEY (`id`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `encrypted`=yes
|
|
ALTER TABLE t2 ENGINE InnoDB;
|
|
SHOW CREATE TABLE t2;
|
|
Table Create Table
|
|
t2 CREATE TABLE `t2` (
|
|
`id` int(11) NOT NULL,
|
|
`a` varchar(255) DEFAULT NULL,
|
|
PRIMARY KEY (`id`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
ALTER TABLE t3 ENGINE InnoDB;
|
|
SHOW CREATE TABLE t3;
|
|
Table Create Table
|
|
t3 CREATE TABLE `t3` (
|
|
`id` int(11) NOT NULL,
|
|
`a` varchar(255) DEFAULT NULL,
|
|
PRIMARY KEY (`id`)
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED `encrypted`=yes
|
|
# Restarting server
|
|
# Done restarting server
|
|
# Verify that tables are still usable
|
|
SELECT COUNT(1) FROM t1;
|
|
COUNT(1)
|
|
10000
|
|
SELECT COUNT(1) FROM t2;
|
|
COUNT(1)
|
|
10000
|
|
SELECT COUNT(1) FROM t3;
|
|
COUNT(1)
|
|
10000
|
|
# Tablespaces should be encrypted after restart
|
|
# t1 yes on expecting NOT FOUND
|
|
NOT FOUND /foobar/ in t1.ibd
|
|
# t2 ... on expecting NOT FOUND
|
|
NOT FOUND /temp/ in t2.ibd
|
|
# t3 ... on expecting NOT FOUND
|
|
NOT FOUND /barfoo/ in t3.ibd
|
|
# Wait max 10 min for key encryption threads to encrypt all spaces
|
|
# Success!
|
|
# Restart mysqld --innodb_encrypt_tables=0 --innodb_encryption_threads=0
|
|
DROP PROCEDURE innodb_insert_proc;
|
|
DROP TABLE t1, t2, t3;
|