1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into moonbone.local:/work/mysql-5.0-bug-11934
This commit is contained in:
evgen@moonbone.local 2005-08-03 14:14:02 +04:00
commit 05d4c0c748
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/r/flush_table.result
View File

@ -101,3 +101,6 @@ table_id
Record-02 Record-02
handler t1 close; handler t1 close;
drop table t1; drop table t1;
FLUSH TABLES WITH READ LOCK ;
FLUSH TABLES WITH READ LOCK ;
UNLOCK TABLES;

7
mysql-test/t/flush_table.test
View File

@ -73,4 +73,11 @@ handler t1 read next limit 1;
handler t1 close; handler t1 close;
drop table t1; drop table t1;
#
# Bug #11934 Two sequential FLUSH TABLES WITH READ LOCK hangs client
#
FLUSH TABLES WITH READ LOCK ;
FLUSH TABLES WITH READ LOCK ;
UNLOCK TABLES;
# End of 4.1 tests # End of 4.1 tests

2
sql/lock.cc
View File

@ -990,7 +990,7 @@ bool make_global_read_lock_block_commit(THD *thd)
make_global_read_lock_block_commit(), do nothing. make_global_read_lock_block_commit(), do nothing.
*/ */
if (thd->global_read_lock != GOT_GLOBAL_READ_LOCK) if (thd->global_read_lock != GOT_GLOBAL_READ_LOCK)
DBUG_RETURN(1); DBUG_RETURN(0);
pthread_mutex_lock(&LOCK_global_read_lock); pthread_mutex_lock(&LOCK_global_read_lock);
/* increment this BEFORE waiting on cond (otherwise race cond) */ /* increment this BEFORE waiting on cond (otherwise race cond) */
global_read_lock_blocks_commit++; global_read_lock_blocks_commit++;