From 14f1453b356fbf0bdf93fce0be3238d91238212d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 22 May 2020 19:56:55 +0300 Subject: [PATCH] MDEV-7318: Fix a test case --- mysql-test/suite/innodb/r/innodb-alter-debug.result | 2 +- mysql-test/suite/innodb/t/innodb-alter-debug.test | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mysql-test/suite/innodb/r/innodb-alter-debug.result b/mysql-test/suite/innodb/r/innodb-alter-debug.result index 48722bbea44..4644c124a45 100644 --- a/mysql-test/suite/innodb/r/innodb-alter-debug.result +++ b/mysql-test/suite/innodb/r/innodb-alter-debug.result @@ -105,5 +105,5 @@ CREATE TABLE t (c1 INT, c2 INT, KEY i2 (c2)) ENGINE=INNODB; SET DEBUG_DBUG= '+d,ib_rename_index_fail1'; ALTER TABLE t RENAME INDEX i2 to x, ALGORITHM=INPLACE; ERROR 40001: Deadlock found when trying to get lock; try restarting transaction -SET DEBUG_DBUG= '-d,ib_rename_index_fail1'; +SET DEBUG_DBUG = @saved_debug_dbug; DROP TABLE t; diff --git a/mysql-test/suite/innodb/t/innodb-alter-debug.test b/mysql-test/suite/innodb/t/innodb-alter-debug.test index 792716aeb4e..7fbbb3159ee 100644 --- a/mysql-test/suite/innodb/t/innodb-alter-debug.test +++ b/mysql-test/suite/innodb/t/innodb-alter-debug.test @@ -130,9 +130,6 @@ reap; UNLOCK TABLES; DROP TABLE t1; -# Wait till all disconnects are completed ---source include/wait_until_count_sessions.inc - --echo # --echo # MDEV-7318 RENAME INDEX --echo # @@ -141,6 +138,9 @@ CREATE TABLE t (c1 INT, c2 INT, KEY i2 (c2)) ENGINE=INNODB; SET DEBUG_DBUG= '+d,ib_rename_index_fail1'; -- error ER_LOCK_DEADLOCK ALTER TABLE t RENAME INDEX i2 to x, ALGORITHM=INPLACE; -SET DEBUG_DBUG= '-d,ib_rename_index_fail1'; +SET DEBUG_DBUG = @saved_debug_dbug; DROP TABLE t; + +# Wait till all disconnects are completed +--source include/wait_until_count_sessions.inc