Skip to content

Commit 886a51d

Browse files
committed
MDEV-35875 Misleading error message for non-existing ENCRYPTION_KEY_ID
update the test case
1 parent 59d679a commit 886a51d

File tree

3 files changed

+9
-0
lines changed

3 files changed

+9
-0
lines changed

mysql-test/suite/encryption/r/filekeys_encfile.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ t1 CREATE TABLE `t1` (
1515
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=2
1616
alter table t1 encryption_key_id=3;
1717
ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ENCRYPTION_KEY_ID'
18+
show warnings;
19+
Level Code Message
20+
Warning 140 InnoDB: ENCRYPTION_KEY_ID 3 not available
21+
Error 1478 Table storage engine 'InnoDB' does not support the create option 'ENCRYPTION_KEY_ID'
1822
show create table t1;
1923
Table Create Table
2024
t1 CREATE TABLE `t1` (

mysql-test/suite/encryption/r/filekeys_encfile_file.result

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ t1 CREATE TABLE `t1` (
1515
) ENGINE=InnoDB DEFAULT CHARSET=latin1 COLLATE=latin1_swedish_ci `encrypted`=yes `encryption_key_id`=2
1616
alter table t1 encryption_key_id=3;
1717
ERROR HY000: Table storage engine 'InnoDB' does not support the create option 'ENCRYPTION_KEY_ID'
18+
show warnings;
19+
Level Code Message
20+
Warning 140 InnoDB: ENCRYPTION_KEY_ID 3 not available
21+
Error 1478 Table storage engine 'InnoDB' does not support the create option 'ENCRYPTION_KEY_ID'
1822
show create table t1;
1923
Table Create Table
2024
t1 CREATE TABLE `t1` (

mysql-test/suite/encryption/t/filekeys_goodtest.inc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ alter table t1 encryption_key_id=2;
99
show create table t1;
1010
--error ER_ILLEGAL_HA_CREATE_OPTION
1111
alter table t1 encryption_key_id=3;
12+
show warnings;
1213
show create table t1;
1314
alter table t1 encryption_key_id=33;
1415
show create table t1;

0 commit comments

Comments
 (0)