mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 13:32:33 +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.)
149 lines
6.3 KiB
Text
149 lines
6.3 KiB
Text
-- source include/have_innodb.inc
|
|
-- source include/have_file_key_management_plugin.inc
|
|
|
|
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
|
|
show warnings;
|
|
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
|
|
show warnings;
|
|
create table innodb_compressed(c1 bigint not null, b char(200)) engine=innodb row_format=compressed encrypted=yes encryption_key_id=2;
|
|
show warnings;
|
|
--error ER_CANT_CREATE_TABLE
|
|
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=3;
|
|
show warnings;
|
|
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=33;
|
|
show warnings;
|
|
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encrypted=yes encryption_key_id=4;
|
|
show warnings;
|
|
|
|
set innodb_default_encryption_key_id = 5;
|
|
create table innodb_defkey(c1 bigint not null, b char(200)) engine=innodb encrypted=yes;
|
|
show create table innodb_defkey;
|
|
|
|
show create table innodb_compact;
|
|
show create table innodb_compressed;
|
|
show create table innodb_dynamic;
|
|
show create table innodb_redundant;
|
|
|
|
delimiter //;
|
|
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 innodb_normal values(current_num, substring(MD5(RAND()), -64));
|
|
set current_num = current_num + 1;
|
|
end while;
|
|
end//
|
|
delimiter ;//
|
|
commit;
|
|
|
|
set autocommit=0;
|
|
call innodb_insert_proc(2000);
|
|
commit;
|
|
set autocommit=1;
|
|
|
|
insert into innodb_compact select * from innodb_normal;
|
|
insert into innodb_compressed select * from innodb_normal;
|
|
insert into innodb_dynamic select * from innodb_normal;
|
|
insert into innodb_redundant select * from innodb_normal;
|
|
insert into innodb_defkey select * from innodb_normal;
|
|
|
|
update innodb_normal set c1 = c1 +1;
|
|
update innodb_compact set c1 = c1 + 1;
|
|
update innodb_compressed set c1 = c1 + 1;
|
|
update innodb_dynamic set c1 = c1 + 1;
|
|
update innodb_redundant set c1 = c1 + 1;
|
|
update innodb_defkey set c1 = c1 + 1;
|
|
|
|
select count(*) from innodb_compact where c1 < 1500000;
|
|
select count(*) from innodb_compressed where c1 < 1500000;
|
|
select count(*) from innodb_dynamic where c1 < 1500000;
|
|
select count(*) from innodb_redundant where c1 < 1500000;
|
|
select count(*) from innodb_defkey where c1 < 1500000;
|
|
select count(*) from innodb_compact t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
select count(*) from innodb_dynamic t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
select count(*) from innodb_compressed t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
select count(*) from innodb_redundant t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
select count(*) from innodb_defkey t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
|
|
# Note there that these variables are updated only when real I/O is done, thus they are not reliable
|
|
SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_encrypted';
|
|
SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
|
|
|
|
--source include/restart_mysqld.inc
|
|
|
|
update innodb_normal set c1 = c1 +1;
|
|
update innodb_compact set c1 = c1 + 1;
|
|
update innodb_compressed set c1 = c1 + 1;
|
|
update innodb_dynamic set c1 = c1 + 1;
|
|
update innodb_redundant set c1 = c1 + 1;
|
|
update innodb_defkey set c1 = c1 + 1;
|
|
select count(*) from innodb_compact where c1 < 1500000;
|
|
select count(*) from innodb_compressed where c1 < 1500000;
|
|
select count(*) from innodb_dynamic where c1 < 1500000;
|
|
select count(*) from innodb_redundant where c1 < 1500000;
|
|
select count(*) from innodb_defkey where c1 < 1500000;
|
|
select count(*) from innodb_compact t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
select count(*) from innodb_dynamic t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
select count(*) from innodb_compressed t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
select count(*) from innodb_redundant t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
select count(*) from innodb_defkey t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
|
|
SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_encrypted';
|
|
SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
|
|
|
|
alter table innodb_compact engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
|
|
show create table innodb_compact;
|
|
alter table innodb_compressed engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
|
|
show create table innodb_compressed;
|
|
alter table innodb_dynamic engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
|
|
show create table innodb_dynamic;
|
|
alter table innodb_redundant engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
|
|
show create table innodb_redundant;
|
|
|
|
--source include/restart_mysqld.inc
|
|
|
|
show create table innodb_compact;
|
|
show create table innodb_compressed;
|
|
show create table innodb_dynamic;
|
|
show create table innodb_redundant;
|
|
show create table innodb_defkey;
|
|
|
|
update innodb_normal set c1 = c1 +1;
|
|
update innodb_compact set c1 = c1 + 1;
|
|
update innodb_compressed set c1 = c1 + 1;
|
|
update innodb_dynamic set c1 = c1 + 1;
|
|
update innodb_redundant set c1 = c1 + 1;
|
|
select count(*) from innodb_compact where c1 < 1500000;
|
|
select count(*) from innodb_compressed where c1 < 1500000;
|
|
select count(*) from innodb_dynamic where c1 < 1500000;
|
|
select count(*) from innodb_redundant where c1 < 1500000;
|
|
select count(*) from innodb_compact t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
select count(*) from innodb_dynamic t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
select count(*) from innodb_compressed t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
select count(*) from innodb_redundant t1, innodb_normal t2 where
|
|
t1.c1 = t2.c1 and t1.b = t2.b;
|
|
|
|
SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_encrypted';
|
|
SELECT variable_value >= 0 FROM information_schema.global_status WHERE variable_name = 'innodb_num_pages_decrypted';
|
|
|
|
drop procedure innodb_insert_proc;
|
|
drop table innodb_normal;
|
|
drop table innodb_compact;
|
|
drop table innodb_compressed;
|
|
drop table innodb_dynamic;
|
|
drop table innodb_redundant;
|
|
drop table innodb_defkey;
|