mirror of
https://github.com/MariaDB/server.git
synced 2025-02-13 17:05:35 +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.)
126 lines
4.8 KiB
Text
126 lines
4.8 KiB
Text
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb;
|
|
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1;
|
|
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=3;
|
|
ERROR HY000: Can't create table `test`.`innodb_dynamic` (errno: 140 "Wrong create options")
|
|
show warnings;
|
|
Level Code Message
|
|
Warning 140 InnoDB: ENCRYPTION_KEY_ID 3 not available
|
|
Error 1005 Can't create table `test`.`innodb_dynamic` (errno: 140 "Wrong create options")
|
|
Warning 1030 Got error 140 "Wrong create options" from storage engine InnoDB
|
|
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=33;
|
|
create table innodb_redundant(c1 bigint not null, b char(200)) engine=innodb row_format=redundant encrypted=yes encryption_key_id=4;
|
|
show create table innodb_compact;
|
|
Table Create Table
|
|
innodb_compact CREATE TABLE `innodb_compact` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT `encrypted`=yes `encryption_key_id`=1
|
|
show create table innodb_dynamic;
|
|
Table Create Table
|
|
innodb_dynamic CREATE TABLE `innodb_dynamic` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC `encrypted`=yes `encryption_key_id`=33
|
|
show create table innodb_redundant;
|
|
Table Create Table
|
|
innodb_redundant CREATE TABLE `innodb_redundant` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT `encrypted`=yes `encryption_key_id`=4
|
|
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()), -150));
|
|
set current_num = current_num + 1;
|
|
end while;
|
|
end//
|
|
commit;
|
|
set autocommit=0;
|
|
call innodb_insert_proc(5000);
|
|
commit;
|
|
set autocommit=1;
|
|
insert into innodb_compact select * from innodb_normal;
|
|
insert into innodb_dynamic select * from innodb_normal;
|
|
insert into innodb_redundant select * from innodb_normal;
|
|
update innodb_compact 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;
|
|
count(*)
|
|
5000
|
|
select count(*) from innodb_dynamic where c1 < 1500000;
|
|
count(*)
|
|
5000
|
|
select count(*) from innodb_redundant where c1 < 1500000;
|
|
count(*)
|
|
5000
|
|
update innodb_compact 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;
|
|
count(*)
|
|
5000
|
|
select count(*) from innodb_dynamic where c1 < 1500000;
|
|
count(*)
|
|
5000
|
|
select count(*) from innodb_redundant where c1 < 1500000;
|
|
count(*)
|
|
5000
|
|
alter table innodb_compact engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
|
|
show create table innodb_compact;
|
|
Table Create Table
|
|
innodb_compact CREATE TABLE `innodb_compact` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
|
|
alter table innodb_dynamic engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
|
|
show create table innodb_dynamic;
|
|
Table Create Table
|
|
innodb_dynamic CREATE TABLE `innodb_dynamic` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
|
|
alter table innodb_redundant engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT;
|
|
show create table innodb_redundant;
|
|
Table Create Table
|
|
innodb_redundant CREATE TABLE `innodb_redundant` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
|
|
show create table innodb_compact;
|
|
Table Create Table
|
|
innodb_compact CREATE TABLE `innodb_compact` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
|
|
show create table innodb_dynamic;
|
|
Table Create Table
|
|
innodb_dynamic CREATE TABLE `innodb_dynamic` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
|
|
show create table innodb_redundant;
|
|
Table Create Table
|
|
innodb_redundant CREATE TABLE `innodb_redundant` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=REDUNDANT
|
|
update innodb_compact 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;
|
|
count(*)
|
|
5000
|
|
select count(*) from innodb_dynamic where c1 < 1500000;
|
|
count(*)
|
|
5000
|
|
select count(*) from innodb_redundant where c1 < 1500000;
|
|
count(*)
|
|
5000
|
|
drop procedure innodb_insert_proc;
|
|
drop table innodb_normal;
|
|
drop table innodb_compact;
|
|
drop table innodb_dynamic;
|
|
drop table innodb_redundant;
|