summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/flush.test9
-rw-r--r--mysql-test/t/rpl000016.test4
2 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/t/flush.test b/mysql-test/t/flush.test
index 773becfeba1..94586519c66 100644
--- a/mysql-test/t/flush.test
+++ b/mysql-test/t/flush.test
@@ -22,4 +22,13 @@ while ($1)
connection con1;
select * from t1;
+connection con2;
+flush tables with read lock;
+--error 1099;
drop table t2;
+connection con1;
+send drop table t2;
+connection con2;
+unlock tables;
+connection con1;
+reap;
diff --git a/mysql-test/t/rpl000016.test b/mysql-test/t/rpl000016.test
index a12fde7eb4c..be694b0e434 100644
--- a/mysql-test/t/rpl000016.test
+++ b/mysql-test/t/rpl000016.test
@@ -85,7 +85,11 @@ slave stop;
slave start;
sync_with_master;
show slave status;
+# because of concurrent insert, the table may not be up to date
+# if we do not lock
+lock tables t3 read;
select count(*) from t3 where n = 4;
+unlock tables;
#clean up
connection master;
drop table if exists t1,t2,t3;