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

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

1 files changed, 21 insertions, 0 deletions

diff --git a/mysql-test/suite/maria/insert_select.test b/mysql-test/suite/maria/insert_select.test
new file mode 100644
index 00000000..a86edc7d
--- /dev/null
+++ b/mysql-test/suite/maria/insert_select.test
@@ -0,0 +1,21 @@
+#
+# MDEV-4010
+# Deadlock on concurrent INSERT .. SELECT into an Aria table with statement
+# binary logging
+#
+--source include/have_binlog_format_statement.inc
+
+create table t1 (pk int primary key) engine=Aria;
+insert into t1 values (1);
+
+send insert into t1 select sleep(2)+1 from t1;
+
+--connect (con1,localhost,root,,)
+
+insert into t1 select 2 from t1;
+
+--connection default
+--error 1062
+--reap
+--disconnect con1
+drop table t1;