Adding upstream version 1:10.11.6.upstream/1%10.11.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 28 insertions, 0 deletions

diff --git a/mysql-test/main/merge-big.result b/mysql-test/main/merge-big.result
new file mode 100644
index 00000000..bd188d7a
--- /dev/null
+++ b/mysql-test/main/merge-big.result
@@ -0,0 +1,28 @@
+drop table if exists t1,t2,t3,t4,t5,t6;
+#
+# Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLE
+#             corrupts a MERGE table
+# Problem #3
+#
+CREATE TABLE t1 (c1 INT) ENGINE= MyISAM;
+LOCK TABLE t1 WRITE;
+connect  con1,localhost,root,,;
+SET @orig_debug=@@global.debug_dbug;
+SET GLOBAL debug_dbug="+d,sleep_open_and_lock_after_open";
+INSERT INTO t1 VALUES (1);
+connection default;
+# Let INSERT go into thr_multi_lock().
+# Kick INSERT out of thr_multi_lock().
+FLUSH TABLES;
+# Let INSERT go through open_tables() where it sleeps.
+# Unlock and close table and wait for con1 to close too.
+FLUSH TABLES;
+# This should give no result.
+SELECT * FROM t1;
+c1
+UNLOCK TABLES;
+connection con1;
+SET GLOBAL debug_dbug=@orig_debug;
+disconnect con1;
+connection default;
+DROP TABLE t1;