Skip to content

Commit be0e3ea

Browse files
committed
Bug#35327006 Stabilize the weekly runs [noclose]
More fixes to the weekly test suite: - Skip main.revoke_if_exists if binlogging is not turned on. - Make sure have_innodb_min_16k.inc is not skipped on PB2. - Fix the previous fix to main.create. Change-Id: I6a48cb27ed3d20518af6c37bcae41ff54ea102d4
1 parent ecdb084 commit be0e3ea

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

mysql-test/include/excludenoskip.list

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ have_innodb_4k.inc
121121
have_innodb_64k.inc
122122
have_innodb_8k.inc
123123
have_innodb_max_16k.inc
124+
have_innodb_min_16k.inc
124125
have_innodb_min_8k.inc
125126
not_have_innodb_4k.inc
126127

mysql-test/t/create.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2378,8 +2378,8 @@ SHOW CREATE TABLE t1;
23782378
# off, cf. Bug#35328161 Inconsequent type derivation when using
23792379
# @variable and binlog off.
23802380
# Accept both results until the bug is fixed.
2381-
--replace_regex /\ text/ longtext/
23822381
CREATE TABLE t2 AS SELECT @max_error_count UNION SELECT 'a';
2382+
--replace_regex /\ text/ longtext/
23832383
SHOW CREATE TABLE t2;
23842384
DROP TABLE t1, t2;
23852385

mysql-test/t/revoke_if_exists.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
--echo # in REVOKE statement
55
--echo #
66

7+
--source include/have_log_bin.inc
78
CREATE DATABASE wl14690;
89
CREATE USER u1,u2,u3,u4;
910
CREATE ROLE r1,r2;

0 commit comments

Comments
 (0)