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.)
70 lines
2.7 KiB
Plaintext
70 lines
2.7 KiB
Plaintext
set global innodb_compression_algorithm = 1;
|
|
create table innodb_normal(c1 bigint not null, b char(200)) engine=innodb page_compressed=1;
|
|
show warnings;
|
|
Level Code Message
|
|
create table innodb_compact(c1 bigint not null, b char(200)) engine=innodb row_format=compact encrypted=yes encryption_key_id=1 page_compressed=1;
|
|
show warnings;
|
|
Level Code Message
|
|
create table innodb_dynamic(c1 bigint not null, b char(200)) engine=innodb row_format=dynamic encrypted=yes encryption_key_id=2 page_compressed=1;
|
|
show warnings;
|
|
Level Code Message
|
|
show create table innodb_normal;
|
|
Table Create Table
|
|
innodb_normal CREATE TABLE `innodb_normal` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1 `page_compressed`=1
|
|
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 `page_compressed`=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`=2 `page_compressed`=1
|
|
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()), -128));
|
|
set current_num = current_num + 1;
|
|
end while;
|
|
end//
|
|
commit;
|
|
begin;
|
|
call innodb_insert_proc(2000);
|
|
insert into innodb_compact select * from innodb_normal;
|
|
insert into innodb_dynamic select * from innodb_normal;
|
|
commit;
|
|
set global innodb_compression_algorithm = 1;
|
|
alter table innodb_normal engine=innodb page_compressed=DEFAULT;
|
|
show create table innodb_normal;
|
|
Table Create Table
|
|
innodb_normal CREATE TABLE `innodb_normal` (
|
|
`c1` bigint(20) NOT NULL,
|
|
`b` char(200) DEFAULT NULL
|
|
) ENGINE=InnoDB DEFAULT CHARSET=latin1
|
|
alter table innodb_compact engine=innodb encrypted=DEFAULT encryption_key_id=DEFAULT page_compressed=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 page_compressed=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
|
|
drop procedure innodb_insert_proc;
|
|
drop table innodb_normal;
|
|
drop table innodb_compact;
|
|
drop table innodb_dynamic;
|