summaryrefslogtreecommitdiff
path: root/mysql-test/r
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-06-06 19:37:33 +0300
committerMichael Widenius <monty@askmonty.org>2011-06-06 19:37:33 +0300
commit29af1aefe914da6aca73498c077f7e37a36d7de4 (patch)
treef2a7b142440d43b85e87daf4eb475ebca20e17a3 /mysql-test/r
parent7e04f7c8fb4954ce47f5520bce59c4c432ceb3cd (diff)
parent6ae42b75b894b5c8a338536861601f2d6d3db686 (diff)
downloadmariadb-git-29af1aefe914da6aca73498c077f7e37a36d7de4.tar.gz
Merge with 5.2 to get bug fixes for thr_lock
Diffstat (limited to 'mysql-test/r')
-rw-r--r--mysql-test/r/lock.result10
1 files changed, 10 insertions, 0 deletions
diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result
index 7ec07fb5273..1828a5f11e0 100644
--- a/mysql-test/r/lock.result
+++ b/mysql-test/r/lock.result
@@ -194,3 +194,13 @@ ERROR HY000: Table 't2' was locked with a READ lock and can't be updated
UNLOCK TABLES;
DROP TABLE t1,t2;
End of 5.1 tests.
+create table t1 (a int) engine=myisam;
+lock tables t1 write concurrent, t1 as t2 read;
+lock tables t1 read local;
+unlock tables;
+unlock tables;
+lock tables t1 read local;
+lock tables t1 write concurrent, t1 as t2 read;
+unlock tables;
+unlock tables;
+drop table t1;