Commit acc42386 authored by unknown's avatar unknown
Browse files

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

into moonbone.local:/work/mysql-5.0-bug-11934
parents 3ca396cd 5792c4d1

mysql-test/r/flush_table.result

+3 −0
Original line number Diff line number Diff line
@@ -101,3 +101,6 @@ table_id 
Record-02

handler t1 close;

drop table t1;

FLUSH TABLES WITH READ LOCK ;

FLUSH TABLES WITH READ LOCK ;

UNLOCK TABLES;

mysql-test/t/flush_table.test

+7 −0
Original line number Diff line number Diff line
@@ -73,4 +73,11 @@ handler t1 read next limit 1; 
handler t1 close;

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

sql/lock.cc

+1 −1
Original line number Diff line number Diff line
@@ -990,7 +990,7 @@ bool make_global_read_lock_block_commit(THD *thd) 
    make_global_read_lock_block_commit(), do nothing.

  */

  if (thd->global_read_lock != GOT_GLOBAL_READ_LOCK)

    DBUG_RETURN(1);

    DBUG_RETURN(0);

  pthread_mutex_lock(&LOCK_global_read_lock);

  /* increment this BEFORE waiting on cond (otherwise race cond) */

  global_read_lock_blocks_commit++;