Skip to content

Commit ac92aff

Browse files
WL#5789: Post push fix
Fixing table_encrypt_2 failure.
1 parent 24fe201 commit ac92aff

File tree

2 files changed

+0
-5
lines changed

2 files changed

+0
-5
lines changed

mysql-test/suite/innodb/r/table_encrypt_2.result

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ call mtr.add_suppression("\\[Error\\] InnoDB: Encryption can't find master key,
33
call mtr.add_suppression("\\[ERROR\\] Function 'keyring_file' already exists");
44
call mtr.add_suppression("\\[ERROR\\] Couldn't load plugin named 'keyring_file' with soname 'keyring_file.*'.");
55
call mtr.add_suppression("Plugin keyring_file reported");
6-
CREATE TABLE t1(c1 int) ENGINE=InnoDB ENCRYPTION="Y";
7-
ERROR HY000: Can't find master key from keyring, please check keyring plugin is loaded.
86
SET @@global.keyring_file_data="MYSQL_TMP_DIR/keyring";
97
CREATE TABLE t1(c1 int) ENGINE=InnoDB ENCRYPTION="Y";
108
DROP TABLE t1;

mysql-test/suite/innodb/t/table_encrypt_2.test

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ call mtr.add_suppression("\\[ERROR\\] Function 'keyring_file' already exists");
1111
call mtr.add_suppression("\\[ERROR\\] Couldn't load plugin named 'keyring_file' with soname 'keyring_file.*'.");
1212
call mtr.add_suppression("Plugin keyring_file reported");
1313

14-
--error 3185
15-
CREATE TABLE t1(c1 int) ENGINE=InnoDB ENCRYPTION="Y";
16-
1714
--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
1815
eval SET @@global.keyring_file_data="$MYSQL_TMP_DIR/keyring";
1916

0 commit comments

Comments
 (0)