summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2005-10-08 14:46:04 +0200
committerunknown <serg@serg.mylan>2005-10-08 14:46:04 +0200
commit51907576bd358fe8ffcf08ad490cc5ac95a0f385 (patch)
tree7de7976c373c2b9bc2b4f15bab50cc1560decda1 /mysql-test
parentb337566babce87b4a5854f18586206525a4ba1b7 (diff)
downloadmariadb-git-51907576bd358fe8ffcf08ad490cc5ac95a0f385.tar.gz
Bug #10942 "deadlock with FLUSH TABLES WITH READ LOCK + STOP SLAVE"
don't allow STOP SLAVE if global read lock is in taken
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/rpl_flush_tables.result6
-rw-r--r--mysql-test/t/rpl_flush_tables.test10
2 files changed, 16 insertions, 0 deletions
diff --git a/mysql-test/r/rpl_flush_tables.result b/mysql-test/r/rpl_flush_tables.result
index 70e4774a920..1bdb79fd0b1 100644
--- a/mysql-test/r/rpl_flush_tables.result
+++ b/mysql-test/r/rpl_flush_tables.result
@@ -38,3 +38,9 @@ master-bin.000001 461 Query 1 461 use `test`; rename table t1 to t5, t2 to t1
master-bin.000001 527 Query 1 527 use `test`; flush tables
select * from t3;
a
+stop slave;
+drop table t1;
+flush tables with read lock;
+start slave;
+stop slave;
+ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
diff --git a/mysql-test/t/rpl_flush_tables.test b/mysql-test/t/rpl_flush_tables.test
index 04158aed9e0..378fa479f09 100644
--- a/mysql-test/t/rpl_flush_tables.test
+++ b/mysql-test/t/rpl_flush_tables.test
@@ -37,4 +37,14 @@ select * from t3;
# Note that all this confusion may cause warnings 'table xx is open on rename'
# in the .err files; these are not fatal and are not reported by mysql-test-run.
+stop slave;
+connection master;
+drop table t1;
+connection slave;
+flush tables with read lock;
+start slave;
+sleep 1;
+--error 1192
+stop slave;
+
# End of 4.1 tests