mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 04:22:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/mysql_src/mysql-4.1-clean

Browse source 
into mysql.com:/home/mysql_src/mysql-5.0-xa


sql/lock.cc:
  Auto merged
This commit is contained in:
unknown 2005-02-23 18:52:15 +01:00
commit c976069e9f
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sql/lock.cc
View file

@ -730,7 +730,7 @@ static void print_lock_error(int error, const char *table)
least the first step above)
global_read_lock_blocks_commit
count of threads which have the global read lock and block
commits (i.e. have completed the second step above)
commits (i.e. are in or have completed the second step above)
waiting_for_read_lock
count of threads which want to take a global read lock but cannot
protect_against_global_read_lock
@ -902,7 +902,8 @@ void start_waiting_global_read_lock(THD *thd)
if (unlikely(thd->global_read_lock))
DBUG_VOID_RETURN;
(void) pthread_mutex_lock(&LOCK_open);
tmp= (!--protect_against_global_read_lock && waiting_for_read_lock);
tmp= (!--protect_against_global_read_lock &&
(waiting_for_read_lock || global_read_lock_blocks_commit));
(void) pthread_mutex_unlock(&LOCK_open);
if (tmp)
pthread_cond_broadcast(&COND_refresh);