diff options
author | unknown <serg@serg.mylan> | 2005-03-16 08:40:19 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2005-03-16 08:40:19 +0100 |
commit | 232dc9221d3ef04decd95f207d85c141d8ad6357 (patch) | |
tree | e444e42c044341f0e074b00d75d409d858ec605f /mysql-test/r/flush.result | |
parent | fc9e2b42d93269b5f98d80e935f31877c87c7567 (diff) | |
download | mariadb-git-232dc9221d3ef04decd95f207d85c141d8ad6357.tar.gz |
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:
global read lock code now uses a dedicated mutex
mysql-test/t/flush.test:
global read lock code now uses a dedicated mutex
sql/lock.cc:
global read lock code now uses a dedicated mutex
sql/mysql_priv.h:
global read lock code now uses a dedicated mutex
sql/mysqld.cc:
global read lock code now uses a dedicated mutex
sql/sql_table.cc:
global read lock code now uses a dedicated mutex
Diffstat (limited to 'mysql-test/r/flush.result')
-rw-r--r-- | mysql-test/r/flush.result | 2 |
1 files changed, 1 insertions, 1 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; |