Skip to content

Commit bc67c6a

Browse files
author
Allen Lai
committed
Fixed testcase table_encrypt_1 failure on windows.
1 parent 2bb7b63 commit bc67c6a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ call mtr.add_suppression("\\[ERROR\\] InnoDB: Failed to find tablespace for tabl
33
call mtr.add_suppression("\\[ERROR\\] InnoDB: Operating system error number 2 in a file operation.");
44
call mtr.add_suppression("\\[ERROR\\] InnoDB: The error means the system cannot find the path specified.");
55
call mtr.add_suppression("\\[ERROR\\] InnoDB: Could not find a valid tablespace file for");
6-
call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption information in datafile: \./test/t1\.ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded.");
6+
call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption information in datafile: .*\.ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded.");
77
call mtr.add_suppression("\\[Warning\\] InnoDB: Ignoring tablespace .* because it could not be opened");
88
call mtr.add_suppression("\\[ERROR\\] InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them.");
99
CREATE TABLE t1(c1 INT, c2 char(20)) ENCRYPTION="Y" ENGINE = InnoDB;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ call mtr.add_suppression("\\[ERROR\\] InnoDB: Failed to find tablespace for tabl
1414
call mtr.add_suppression("\\[ERROR\\] InnoDB: Operating system error number 2 in a file operation.");
1515
call mtr.add_suppression("\\[ERROR\\] InnoDB: The error means the system cannot find the path specified.");
1616
call mtr.add_suppression("\\[ERROR\\] InnoDB: Could not find a valid tablespace file for");
17-
call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption information in datafile: \./test/t1\.ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded.");
17+
call mtr.add_suppression("\\[ERROR\\] InnoDB: Encryption information in datafile: .*\.ibd can't be decrypted , please confirm the keyfile is match and keyring plugin is loaded.");
1818
call mtr.add_suppression("\\[Warning\\] InnoDB: Ignoring tablespace .* because it could not be opened");
1919
call mtr.add_suppression("\\[ERROR\\] InnoDB: If you are installing InnoDB, remember that you must create directories yourself, InnoDB does not create them.");
2020
--error ER_CANNOT_FIND_KEY_IN_KEYRING

0 commit comments

Comments
 (0)