summaryrefslogtreecommitdiff
path: root/mysql-test/r/drop.result
diff options
context:
space:
mode:
authorunknown <gluh@gluh.mysql.r18.ru>2003-08-28 18:09:00 +0500
committerunknown <gluh@gluh.mysql.r18.ru>2003-08-28 18:09:00 +0500
commit241ed6b81caf0248200aacbd7e945a24ce835baa (patch)
treed0c13f66f3fb6662f823e9eff89889816d5b1925 /mysql-test/r/drop.result
parent5f8cc0998f6366c46cc20e42e4989f8f3f468f03 (diff)
downloadmariadb-git-241ed6b81caf0248200aacbd7e945a24ce835baa.tar.gz
Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
This commit is related to my previos one(ChangeSet 1.1583 03/08/27 18:03:39). Note about COMMIT&ROLLBACK: Only 'COMMIT' statement updates the binary log. 'ROLLBACK' statement doesn't update the binlog. mysql-test/r/drop.result: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE mysql-test/r/innodb.result: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE mysql-test/t/drop.test: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE mysql-test/t/innodb.test: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE sql/handler.cc: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE sql/sql_table.cc: Fix for bug #799 FLUSH TABLES WITH READ LOCK does not block CREATE TABLE
Diffstat (limited to 'mysql-test/r/drop.result')
-rw-r--r--mysql-test/r/drop.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/drop.result b/mysql-test/r/drop.result
index dbb6800cb75..3748af1b8f9 100644
--- a/mysql-test/r/drop.result
+++ b/mysql-test/r/drop.result
@@ -47,7 +47,7 @@ ERROR HY000: Can't drop database 'mysqltest'; database doesn't exist
drop table t1;
flush tables with read lock;
create table t1(n int);
-ERROR HY000: Table 't1' was locked with a READ lock and can't be updated
+ERROR HY000: Can't execute the query because you have a conflicting read lock
unlock tables;
create table t1(n int);
show tables;