From d7b2d4c541eac4e2dde9feff938a230cd24ff767 Mon Sep 17 00:00:00 2001
From: "serg@serg.mylan" <>
Date: Wed, 16 Mar 2005 08:40:19 +0100
Subject: global read lock code now uses a dedicated mutex (otherwise a
 deadlock when ALTER writes to binlog holding LOCK_open, it causes binlog
 rotation, binlog waits for prepared transactions to commit, and commit needs
 LOCK_open to check for global read lock)

---
 mysql-test/r/flush.result | 2 +-
 mysql-test/t/flush.test   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'mysql-test')

diff --git a/mysql-test/r/flush.result b/mysql-test/r/flush.result
index bab9b543307..306376b13c3 100644
--- a/mysql-test/r/flush.result
+++ b/mysql-test/r/flush.result
@@ -8,7 +8,7 @@ n
 3
 flush tables with read lock;
 drop table t2;
-ERROR HY000: Table 't2' 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
  drop table t2;
 unlock tables;
 create database mysqltest;
diff --git a/mysql-test/t/flush.test b/mysql-test/t/flush.test
index 9ee6b5d76b8..62af9d4932b 100644
--- a/mysql-test/t/flush.test
+++ b/mysql-test/t/flush.test
@@ -37,7 +37,7 @@ connection con1;
 select * from t1;
 connection con2;
 flush tables with read lock;
---error 1099;
+--error 1223
 drop table t2;
 connection con1;
 send drop table t2;
-- 
cgit v1.2.1