diff options
| author | serg@serg.mylan <> | 2005-03-17 08:46:48 +0100 |
|---|---|---|
| committer | serg@serg.mylan <> | 2005-03-17 08:46:48 +0100 |
| commit | 41997cf263ae69e623bf0ac8170a813d3e409999 (patch) | |
| tree | 37a5d35e424f7ed118f092a6b045f239969554e3 /mysql-test | |
| parent | 1fbb61754b1f96902043d1e5716d6260d42222c1 (diff) | |
| parent | 4afb7365764b7a0e6a4ea4fa7022c8141663059a (diff) | |
| download | mariadb-git-41997cf263ae69e623bf0ac8170a813d3e409999.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/flush.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/flush.test | 2 |
2 files changed, 2 insertions, 2 deletions
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; |