mirror of
https://github.com/MariaDB/server.git
synced 2025-02-04 21:02:17 +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.)
108 lines
4.9 KiB
Text
108 lines
4.9 KiB
Text
-- source include/have_innodb.inc
|
|
-- source include/have_file_key_management_plugin.inc
|
|
-- source include/not_embedded.inc
|
|
|
|
create table innodb_compressed1(c1 bigint not null primary key, d int, a varchar(20), b char(200)) engine=innodb row_format=compressed encrypted=yes;
|
|
create table innodb_compressed2(c1 bigint not null primary key, d int, a varchar(20), b char(200)) engine=innodb row_format=compressed key_block_size=1 encrypted=yes;
|
|
create table innodb_compressed3(c1 bigint not null primary key, d int, a varchar(20), b char(200)) engine=innodb row_format=compressed key_block_size=2 encrypted=yes;
|
|
create table innodb_compressed4(c1 bigint not null primary key, d int, a varchar(20), b char(200)) engine=innodb row_format=compressed key_block_size=4 encrypted=yes;
|
|
|
|
insert into innodb_compressed1 values (1, 20, 'private', 'evenmoreprivate');
|
|
insert into innodb_compressed1 values (2, 20, 'private', 'evenmoreprivate');
|
|
insert into innodb_compressed1 values (3, 30, 'private', 'evenmoreprivate');
|
|
insert into innodb_compressed1 values (4, 30, 'private', 'evenmoreprivate');
|
|
insert into innodb_compressed1 values (5, 30, 'private', 'evenmoreprivate');
|
|
insert into innodb_compressed1 values (6, 30, 'private', 'evenmoreprivate');
|
|
insert into innodb_compressed1 values (7, 30, 'private', 'evenmoreprivate');
|
|
insert into innodb_compressed1 values (8, 20, 'private', 'evenmoreprivate');
|
|
insert into innodb_compressed1 values (9, 20, 'private', 'evenmoreprivate');
|
|
insert into innodb_compressed1 values (10, 20, 'private', 'evenmoreprivate');
|
|
|
|
insert into innodb_compressed2 select * from innodb_compressed1;
|
|
insert into innodb_compressed3 select * from innodb_compressed1;
|
|
insert into innodb_compressed4 select * from innodb_compressed1;
|
|
|
|
--source include/restart_mysqld.inc
|
|
|
|
--let $MYSQLD_DATADIR=`select @@datadir`
|
|
--let t1_IBD = $MYSQLD_DATADIR/test/innodb_compressed1.ibd
|
|
--let t2_IBD = $MYSQLD_DATADIR/test/innodb_compressed2.ibd
|
|
--let t3_IBD = $MYSQLD_DATADIR/test/innodb_compressed3.ibd
|
|
--let t4_IBD = $MYSQLD_DATADIR/test/innodb_compressed4.ibd
|
|
--let SEARCH_RANGE = 10000000
|
|
--let SEARCH_PATTERN=private
|
|
--echo # t1 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t1_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
--echo # t2 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t2_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
--echo # t3 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t3_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
--echo # t4 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t4_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
|
|
select * from innodb_compressed1 where d = 20;
|
|
select * from innodb_compressed1 where d = 30;
|
|
select * from innodb_compressed2 where d = 20;
|
|
select * from innodb_compressed2 where d = 30;
|
|
select * from innodb_compressed3 where d = 20;
|
|
select * from innodb_compressed3 where d = 30;
|
|
select * from innodb_compressed4 where d = 20;
|
|
select * from innodb_compressed4 where d = 30;
|
|
|
|
update innodb_compressed1 set d = d + 10 where d = 30;
|
|
update innodb_compressed2 set d = d + 10 where d = 30;
|
|
update innodb_compressed3 set d = d + 10 where d = 30;
|
|
update innodb_compressed4 set d = d + 10 where d = 30;
|
|
|
|
insert into innodb_compressed1 values (20, 60, 'newprivate', 'newevenmoreprivate');
|
|
insert into innodb_compressed2 values (20, 60, 'newprivate', 'newevenmoreprivate');
|
|
insert into innodb_compressed3 values (20, 60, 'newprivate', 'newevenmoreprivate');
|
|
insert into innodb_compressed4 values (20, 60, 'newprivate', 'newevenmoreprivate');
|
|
|
|
--let SEARCH_PATTERN=private
|
|
--echo # t1 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t1_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
--echo # t2 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t2_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
--echo # t3 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t3_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
--echo # t4 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t4_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
|
|
--source include/restart_mysqld.inc
|
|
|
|
select * from innodb_compressed1 where d = 40;
|
|
select * from innodb_compressed1 where d = 60;
|
|
select * from innodb_compressed2 where d = 40;
|
|
select * from innodb_compressed2 where d = 60;
|
|
select * from innodb_compressed3 where d = 40;
|
|
select * from innodb_compressed3 where d = 60;
|
|
select * from innodb_compressed4 where d = 40;
|
|
select * from innodb_compressed4 where d = 60;
|
|
|
|
--let SEARCH_PATTERN=private
|
|
--echo # t1 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t1_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
--echo # t2 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t2_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
--echo # t3 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t3_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
--echo # t4 yes on expecting NOT FOUND
|
|
-- let SEARCH_FILE=$t4_IBD
|
|
-- source include/search_pattern_in_file.inc
|
|
|
|
drop table innodb_compressed1;
|
|
drop table innodb_compressed2;
|
|
drop table innodb_compressed3;
|
|
drop table innodb_compressed4;
|