Skip to content

Commit 14f1453

Browse files
committed
MDEV-7318: Fix a test case
1 parent b934a34 commit 14f1453

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

mysql-test/suite/innodb/r/innodb-alter-debug.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,5 +105,5 @@ CREATE TABLE t (c1 INT, c2 INT, KEY i2 (c2)) ENGINE=INNODB;
105105
SET DEBUG_DBUG= '+d,ib_rename_index_fail1';
106106
ALTER TABLE t RENAME INDEX i2 to x, ALGORITHM=INPLACE;
107107
ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
108-
SET DEBUG_DBUG= '-d,ib_rename_index_fail1';
108+
SET DEBUG_DBUG = @saved_debug_dbug;
109109
DROP TABLE t;

mysql-test/suite/innodb/t/innodb-alter-debug.test

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,9 +130,6 @@ reap;
130130
UNLOCK TABLES;
131131
DROP TABLE t1;
132132

133-
# Wait till all disconnects are completed
134-
--source include/wait_until_count_sessions.inc
135-
136133
--echo #
137134
--echo # MDEV-7318 RENAME INDEX
138135
--echo #
@@ -141,6 +138,9 @@ CREATE TABLE t (c1 INT, c2 INT, KEY i2 (c2)) ENGINE=INNODB;
141138
SET DEBUG_DBUG= '+d,ib_rename_index_fail1';
142139
-- error ER_LOCK_DEADLOCK
143140
ALTER TABLE t RENAME INDEX i2 to x, ALGORITHM=INPLACE;
144-
SET DEBUG_DBUG= '-d,ib_rename_index_fail1';
141+
SET DEBUG_DBUG = @saved_debug_dbug;
145142

146143
DROP TABLE t;
144+
145+
# Wait till all disconnects are completed
146+
--source include/wait_until_count_sessions.inc

0 commit comments

Comments
 (0)