Skip to content

Commit 2bb7b63

Browse files
author
Allen Lai
committed
Fixed testcase failure of TDE push.
They're all test case issues.
1 parent 9340eb1 commit 2bb7b63

File tree

4 files changed

+4
-144
lines changed

4 files changed

+4
-144
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: \./test/t1\.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/r/table_encrypt_3.result

Lines changed: 1 addition & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -811,7 +811,7 @@ end|
811811
CREATE PROCEDURE tde_db.read_t_encrypt()
812812
begin
813813
declare i int default 1;
814-
while (i <= 100) DO
814+
while (i <= 30) DO
815815
SELECT * FROM (SELECT * FROM tde_db.t_encrypt ORDER BY RAND() LIMIT 1) AS A WHERE A.c2 < 0 ;
816816
set i = i + 1;
817817
end while;
@@ -898,76 +898,6 @@ c2 c3 c4 c5 c6 c7
898898
c2 c3 c4 c5 c6 c7
899899
c2 c3 c4 c5 c6 c7
900900
c2 c3 c4 c5 c6 c7
901-
c2 c3 c4 c5 c6 c7
902-
c2 c3 c4 c5 c6 c7
903-
c2 c3 c4 c5 c6 c7
904-
c2 c3 c4 c5 c6 c7
905-
c2 c3 c4 c5 c6 c7
906-
c2 c3 c4 c5 c6 c7
907-
c2 c3 c4 c5 c6 c7
908-
c2 c3 c4 c5 c6 c7
909-
c2 c3 c4 c5 c6 c7
910-
c2 c3 c4 c5 c6 c7
911-
c2 c3 c4 c5 c6 c7
912-
c2 c3 c4 c5 c6 c7
913-
c2 c3 c4 c5 c6 c7
914-
c2 c3 c4 c5 c6 c7
915-
c2 c3 c4 c5 c6 c7
916-
c2 c3 c4 c5 c6 c7
917-
c2 c3 c4 c5 c6 c7
918-
c2 c3 c4 c5 c6 c7
919-
c2 c3 c4 c5 c6 c7
920-
c2 c3 c4 c5 c6 c7
921-
c2 c3 c4 c5 c6 c7
922-
c2 c3 c4 c5 c6 c7
923-
c2 c3 c4 c5 c6 c7
924-
c2 c3 c4 c5 c6 c7
925-
c2 c3 c4 c5 c6 c7
926-
c2 c3 c4 c5 c6 c7
927-
c2 c3 c4 c5 c6 c7
928-
c2 c3 c4 c5 c6 c7
929-
c2 c3 c4 c5 c6 c7
930-
c2 c3 c4 c5 c6 c7
931-
c2 c3 c4 c5 c6 c7
932-
c2 c3 c4 c5 c6 c7
933-
c2 c3 c4 c5 c6 c7
934-
c2 c3 c4 c5 c6 c7
935-
c2 c3 c4 c5 c6 c7
936-
c2 c3 c4 c5 c6 c7
937-
c2 c3 c4 c5 c6 c7
938-
c2 c3 c4 c5 c6 c7
939-
c2 c3 c4 c5 c6 c7
940-
c2 c3 c4 c5 c6 c7
941-
c2 c3 c4 c5 c6 c7
942-
c2 c3 c4 c5 c6 c7
943-
c2 c3 c4 c5 c6 c7
944-
c2 c3 c4 c5 c6 c7
945-
c2 c3 c4 c5 c6 c7
946-
c2 c3 c4 c5 c6 c7
947-
c2 c3 c4 c5 c6 c7
948-
c2 c3 c4 c5 c6 c7
949-
c2 c3 c4 c5 c6 c7
950-
c2 c3 c4 c5 c6 c7
951-
c2 c3 c4 c5 c6 c7
952-
c2 c3 c4 c5 c6 c7
953-
c2 c3 c4 c5 c6 c7
954-
c2 c3 c4 c5 c6 c7
955-
c2 c3 c4 c5 c6 c7
956-
c2 c3 c4 c5 c6 c7
957-
c2 c3 c4 c5 c6 c7
958-
c2 c3 c4 c5 c6 c7
959-
c2 c3 c4 c5 c6 c7
960-
c2 c3 c4 c5 c6 c7
961-
c2 c3 c4 c5 c6 c7
962-
c2 c3 c4 c5 c6 c7
963-
c2 c3 c4 c5 c6 c7
964-
c2 c3 c4 c5 c6 c7
965-
c2 c3 c4 c5 c6 c7
966-
c2 c3 c4 c5 c6 c7
967-
c2 c3 c4 c5 c6 c7
968-
c2 c3 c4 c5 c6 c7
969-
c2 c3 c4 c5 c6 c7
970-
c2 c3 c4 c5 c6 c7
971901
# In connection con4
972902
c2 c3 c4 c5 c6 c7
973903
c2 c3 c4 c5 c6 c7
@@ -999,76 +929,6 @@ c2 c3 c4 c5 c6 c7
999929
c2 c3 c4 c5 c6 c7
1000930
c2 c3 c4 c5 c6 c7
1001931
c2 c3 c4 c5 c6 c7
1002-
c2 c3 c4 c5 c6 c7
1003-
c2 c3 c4 c5 c6 c7
1004-
c2 c3 c4 c5 c6 c7
1005-
c2 c3 c4 c5 c6 c7
1006-
c2 c3 c4 c5 c6 c7
1007-
c2 c3 c4 c5 c6 c7
1008-
c2 c3 c4 c5 c6 c7
1009-
c2 c3 c4 c5 c6 c7
1010-
c2 c3 c4 c5 c6 c7
1011-
c2 c3 c4 c5 c6 c7
1012-
c2 c3 c4 c5 c6 c7
1013-
c2 c3 c4 c5 c6 c7
1014-
c2 c3 c4 c5 c6 c7
1015-
c2 c3 c4 c5 c6 c7
1016-
c2 c3 c4 c5 c6 c7
1017-
c2 c3 c4 c5 c6 c7
1018-
c2 c3 c4 c5 c6 c7
1019-
c2 c3 c4 c5 c6 c7
1020-
c2 c3 c4 c5 c6 c7
1021-
c2 c3 c4 c5 c6 c7
1022-
c2 c3 c4 c5 c6 c7
1023-
c2 c3 c4 c5 c6 c7
1024-
c2 c3 c4 c5 c6 c7
1025-
c2 c3 c4 c5 c6 c7
1026-
c2 c3 c4 c5 c6 c7
1027-
c2 c3 c4 c5 c6 c7
1028-
c2 c3 c4 c5 c6 c7
1029-
c2 c3 c4 c5 c6 c7
1030-
c2 c3 c4 c5 c6 c7
1031-
c2 c3 c4 c5 c6 c7
1032-
c2 c3 c4 c5 c6 c7
1033-
c2 c3 c4 c5 c6 c7
1034-
c2 c3 c4 c5 c6 c7
1035-
c2 c3 c4 c5 c6 c7
1036-
c2 c3 c4 c5 c6 c7
1037-
c2 c3 c4 c5 c6 c7
1038-
c2 c3 c4 c5 c6 c7
1039-
c2 c3 c4 c5 c6 c7
1040-
c2 c3 c4 c5 c6 c7
1041-
c2 c3 c4 c5 c6 c7
1042-
c2 c3 c4 c5 c6 c7
1043-
c2 c3 c4 c5 c6 c7
1044-
c2 c3 c4 c5 c6 c7
1045-
c2 c3 c4 c5 c6 c7
1046-
c2 c3 c4 c5 c6 c7
1047-
c2 c3 c4 c5 c6 c7
1048-
c2 c3 c4 c5 c6 c7
1049-
c2 c3 c4 c5 c6 c7
1050-
c2 c3 c4 c5 c6 c7
1051-
c2 c3 c4 c5 c6 c7
1052-
c2 c3 c4 c5 c6 c7
1053-
c2 c3 c4 c5 c6 c7
1054-
c2 c3 c4 c5 c6 c7
1055-
c2 c3 c4 c5 c6 c7
1056-
c2 c3 c4 c5 c6 c7
1057-
c2 c3 c4 c5 c6 c7
1058-
c2 c3 c4 c5 c6 c7
1059-
c2 c3 c4 c5 c6 c7
1060-
c2 c3 c4 c5 c6 c7
1061-
c2 c3 c4 c5 c6 c7
1062-
c2 c3 c4 c5 c6 c7
1063-
c2 c3 c4 c5 c6 c7
1064-
c2 c3 c4 c5 c6 c7
1065-
c2 c3 c4 c5 c6 c7
1066-
c2 c3 c4 c5 c6 c7
1067-
c2 c3 c4 c5 c6 c7
1068-
c2 c3 c4 c5 c6 c7
1069-
c2 c3 c4 c5 c6 c7
1070-
c2 c3 c4 c5 c6 c7
1071-
c2 c3 c4 c5 c6 c7
1072932
# In connection con5
1073933
# In connection con6
1074934
# In connection con7

‎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: \./test/t1\.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

‎mysql-test/suite/innodb/t/table_encrypt_3.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ end|
389389
CREATE PROCEDURE tde_db.read_t_encrypt()
390390
begin
391391
declare i int default 1;
392-
while (i <= 100) DO
392+
while (i <= 30) DO
393393
SELECT * FROM (SELECT * FROM tde_db.t_encrypt ORDER BY RAND() LIMIT 1) AS A WHERE A.c2 < 0 ;
394394
set i = i + 1;
395395
end while;

0 commit comments

Comments
 (0)