From 55c17211ed499f3bd9d0b6d20986a389773e8667 Mon Sep 17 00:00:00 2001 From: Denis Protivensky Date: Tue, 29 Apr 2025 13:40:34 +0300 Subject: [PATCH] MDEV-36710: Revert "MDEV-33136: backport corrections from 10.11+" This reverts commit 0403f0147f176190b6a2ca61996c12eada275e4c. It caused MDEV-33136 test to fail in 10.6 branch. --- mysql-test/suite/galera/r/MDEV-33136.result | 2 +- mysql-test/suite/galera/t/MDEV-33136.test | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/galera/r/MDEV-33136.result b/mysql-test/suite/galera/r/MDEV-33136.result index fb9945235d6cd..36159fa05cd0c 100644 --- a/mysql-test/suite/galera/r/MDEV-33136.result +++ b/mysql-test/suite/galera/r/MDEV-33136.result @@ -4,7 +4,7 @@ connect node_1a,127.0.0.1,root,,test,$NODE_MYPORT_1; connection node_1; CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; connection node_1a; -RENAME TABLE t1 TO tmp, tmp TO t1; +TRUNCATE TABLE t1; SET SESSION wsrep_retry_autocommit = 0; SET DEBUG_SYNC = 'dict_stats_mdl_acquired SIGNAL may_toi WAIT_FOR bf_abort'; INSERT INTO t1 VALUES (1); diff --git a/mysql-test/suite/galera/t/MDEV-33136.test b/mysql-test/suite/galera/t/MDEV-33136.test index dc1ae1aecdd7c..4b484eb47dabb 100644 --- a/mysql-test/suite/galera/t/MDEV-33136.test +++ b/mysql-test/suite/galera/t/MDEV-33136.test @@ -20,8 +20,8 @@ CREATE TABLE t1 (f1 INTEGER PRIMARY KEY) ENGINE=InnoDB; --connection node_1a -RENAME TABLE t1 TO tmp, tmp TO t1; -# RENAME forces the next statement to re-read statistics from persistent storage, +TRUNCATE TABLE t1; +# TRUNCATE forces the next statement to re-read statistics from persistent storage, # which will acquire MDL locks on the statistics tables in InnoDB. SET SESSION wsrep_retry_autocommit = 0; SET DEBUG_SYNC = 'dict_stats_mdl_acquired SIGNAL may_toi WAIT_FOR bf_abort';