mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +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
8.7 KiB
Text
149 lines
8.7 KiB
Text
call mtr.add_suppression("File '.*keys.txt' not found");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 1 /File '.*keys.txt' not found/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
install soname 'file_key_management';
|
|
ERROR HY000: Invalid key id at MYSQL_TMP_DIR/keys.txt line 2, column 2
|
|
call mtr.add_suppression("File '.*keys.txt' not found");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 1 /File '.*keys.txt' not found/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
call mtr.add_suppression("Invalid key id");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 1 /Invalid key id/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
install soname 'file_key_management';
|
|
ERROR HY000: Invalid key id at MYSQL_TMP_DIR/keys.txt line 2, column 10
|
|
call mtr.add_suppression("Invalid key id");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 2 /Invalid key id/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
call mtr.add_suppression("Invalid key id");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 2 /Invalid key id/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
install soname 'file_key_management';
|
|
ERROR HY000: Invalid key at MYSQL_TMP_DIR/keys.txt line 2, column 47
|
|
call mtr.add_suppression("Invalid key id");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 2 /Invalid key id/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
call mtr.add_suppression("Invalid key");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 3 /Invalid key/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
install soname 'file_key_management';
|
|
ERROR HY000: Invalid key at MYSQL_TMP_DIR/keys.txt line 2, column 33
|
|
call mtr.add_suppression("Invalid key");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 4 /Invalid key/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
call mtr.add_suppression("Invalid key");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 4 /Invalid key/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
install soname 'file_key_management';
|
|
ERROR HY000: Syntax error at MYSQL_TMP_DIR/keys.txt line 2, column 2
|
|
call mtr.add_suppression("Invalid key");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 4 /Invalid key/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
call mtr.add_suppression("Syntax error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 1 /Syntax error/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
install soname 'file_key_management';
|
|
ERROR HY000: Syntax error at MYSQL_TMP_DIR/keys.txt line 2, column 1
|
|
call mtr.add_suppression("Syntax error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 2 /Syntax error/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
call mtr.add_suppression("Syntax error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 2 /Syntax error/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
install soname 'file_key_management';
|
|
ERROR HY000: System key id 1 is missing at MYSQL_TMP_DIR/keys.txt line 1, column 1
|
|
call mtr.add_suppression("Syntax error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 2 /Syntax error/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|
|
call mtr.add_suppression("System key id 1");
|
|
call mtr.add_suppression("Plugin 'file_key_management' init function returned error");
|
|
call mtr.add_suppression("Plugin 'file_key_management' registration.*failed");
|
|
FOUND 1 /System key id 1/ in mysqld.1.err
|
|
create table t1(c1 bigint not null, b char(200)) engine=innodb encrypted=yes encryption_key_id=1;
|
|
ERROR HY000: Can't create table `test`.`t1` (errno: 140 "Wrong create options")
|
|
select plugin_status from information_schema.plugins
|
|
where plugin_name = 'file_key_management';
|
|
plugin_status
|