diff options
| author | unknown <ingo@mysql.com> | 2006-05-29 15:30:13 +0200 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2006-05-29 15:30:13 +0200 |
| commit | e6ca5f195360dd4e89888d6f607f1e179da075a0 (patch) | |
| tree | d6f4f8c5a1de1f84d3a8fd9931823411ae0de5f6 /mysql-test/r/lock_multi.result | |
| parent | fe7716dad927beb48709cfebbe3355c8495750c1 (diff) | |
| parent | 4f8407b6315736ab52b49e1e248e7585614c3f20 (diff) | |
| download | mariadb-git-e6ca5f195360dd4e89888d6f607f1e179da075a0.tar.gz | |
Merge mysql.com:/home/mydev/mysql-5.0-bug19815
into mysql.com:/home/mydev/mysql-5.1-bug19815
mysql-test/r/lock_multi.result:
Auto merged
mysql-test/t/lock_multi.test:
Auto merged
sql/sql_db.cc:
SCCS merged
Diffstat (limited to 'mysql-test/r/lock_multi.result')
| -rw-r--r-- | mysql-test/r/lock_multi.result | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/r/lock_multi.result b/mysql-test/r/lock_multi.result index 1ab51e9fad5..debdf636eae 100644 --- a/mysql-test/r/lock_multi.result +++ b/mysql-test/r/lock_multi.result @@ -50,3 +50,11 @@ Field Type Null Key Default Extra a int(11) YES NULL unlock tables; drop table t1; +CREATE DATABASE mysqltest_1; +FLUSH TABLES WITH READ LOCK; + DROP DATABASE mysqltest_1; +DROP DATABASE mysqltest_1; +ERROR HY000: Can't execute the query because you have a conflicting read lock +UNLOCK TABLES; +DROP DATABASE mysqltest_1; +ERROR HY000: Can't drop database 'mysqltest_1'; database doesn't exist |