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

diff --git a/mysql-test/main/flush_block_commit_notembedded.test b/mysql-test/main/flush_block_commit_notembedded.test
new file mode 100644
index 00000000..02464089
--- /dev/null
+++ b/mysql-test/main/flush_block_commit_notembedded.test
@@ -0,0 +1,68 @@
+# Let's see if FLUSH TABLES WITH READ LOCK blocks COMMIT of existing
+# transactions.
+# We verify that we did not introduce a deadlock.
+# This is intended to mimick how mysqldump and innobackup work.
+
+--source include/have_log_bin.inc
+
+# And it requires InnoDB
+--source include/have_log_bin.inc
+--source include/have_innodb.inc
+
+--echo # Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
+--disable_query_log
+# This may be triggered on a slow system or one that lacks native AIO.
+call mtr.add_suppression("InnoDB: Trying to delete tablespace.*pending operations");
+--enable_query_log
+
+connect (con1,localhost,root,,);
+connect (con2,localhost,root,,);
+
+# FLUSH TABLES WITH READ LOCK should block writes to binlog too
+connection con1;
+CREATE TABLE t1 (a INT) ENGINE=innodb;
+RESET MASTER;
+SET AUTOCOMMIT=0;
+SELECT 1;
+connection con2;
+FLUSH TABLES WITH READ LOCK;
+--source include/show_binlog_events.inc
+connection con1;
+send INSERT INTO t1 VALUES (1);
+connection con2;
+sleep 1;
+--source include/show_binlog_events.inc
+UNLOCK TABLES;
+connection con1;
+reap;
+DROP TABLE t1;
+SET AUTOCOMMIT=1;
+
+# GLR blocks new transactions
+create table t1 (a int) engine=innodb;
+connection con1;
+flush tables with read lock;
+connection con2;
+begin;
+--send insert into t1 values (1);
+connection con1;
+let $wait_condition=
+  select count(*) = 1 from information_schema.processlist
+  where state = "Waiting for backup lock" and
+        info = "insert into t1 values (1)";
+--source include/wait_condition.inc
+unlock tables;
+connection con2;
+--reap
+commit;
+drop table t1;
+
+connection default;
+disconnect con1;
+disconnect con2;
+
+--echo # Wait till all disconnects are completed
+--source include/wait_until_count_sessions.inc
+