summaryrefslogtreecommitdiff
path: root/mysql-test/r/flush.result
diff options
context:
space:
mode:
authoringo@mysql.com <>2005-08-08 00:10:07 +0200
committeringo@mysql.com <>2005-08-08 00:10:07 +0200
commit806b5468b890b508d472fd4816bf1fb50de8ccbe (patch)
treefbe0e29e779081da2f03d69a2b387ea0c9d89424 /mysql-test/r/flush.result
parentb3eed0e49cf093d11eb6710f906b701bb58386dc (diff)
parentfd946d42a8373e232ac29383a7e4be670152e662 (diff)
downloadmariadb-git-806b5468b890b508d472fd4816bf1fb50de8ccbe.tar.gz
Merge mysql.com:/home/mydev/mysql-4.1-4100
into mysql.com:/home/mydev/mysql-5.0-5000
Diffstat (limited to 'mysql-test/r/flush.result')
-rw-r--r--mysql-test/r/flush.result21
1 files changed, 21 insertions, 0 deletions
diff --git a/mysql-test/r/flush.result b/mysql-test/r/flush.result
index 306376b13c3..16c308e3450 100644
--- a/mysql-test/r/flush.result
+++ b/mysql-test/r/flush.result
@@ -27,3 +27,24 @@ select * from t1;
n
345
drop table t1;
+create table t1 (c1 int);
+lock table t1 write;
+flush tables with read lock;
+ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
+lock table t1 read;
+flush tables with read lock;
+lock table t1 write;
+ERROR HY000: Can't execute the query because you have a conflicting read lock
+lock table t1 read;
+lock table t1 write;
+ERROR HY000: Can't execute the query because you have a conflicting read lock
+unlock tables;
+create table t2 (c1 int);
+create table t3 (c1 int);
+lock table t1 read, t2 read, t3 write;
+flush tables with read lock;
+ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction
+lock table t1 read, t2 read, t3 read;
+flush tables with read lock;
+unlock tables;
+drop table t1, t2, t3;