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, 24 insertions, 0 deletions

diff --git a/mysql-test/main/concurrent_innodb_safelog.test b/mysql-test/main/concurrent_innodb_safelog.test
new file mode 100644
index 00000000..d590dfa6
--- /dev/null
+++ b/mysql-test/main/concurrent_innodb_safelog.test
@@ -0,0 +1,24 @@
+# t/concurrent_innodb_safelog.test
+#
+# Concurrent InnoDB tests
+#
+# Last update:
+# 2006-07-26 ML test refactored (MySQL 5.1)
+#               main code t/innodb_concurrent.test -> include/concurrent.inc
+#               new wrapper t/concurrent_innodb.test
+# 2008-06-03 KP test refactored; removed name locks, added comments.
+#               renamed wrapper t/concurrent_innodb.test ->
+#                           t/concurrent_innodb_unsafelog.test
+#               new wrapper t/concurrent_innodb_safelog.test
+#
+--source include/have_innodb.inc
+
+let $engine_type= InnoDB;
+
+SET @save_timeout = @@GLOBAL.innodb_lock_wait_timeout;
+SET GLOBAL innodb_lock_wait_timeout = 1;
+SET GLOBAL TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+--disable_service_connection
+--source include/concurrent.inc
+--enable_service_connection
+SET GLOBAL innodb_lock_wait_timeout = @save_timeout;