Commit c976069e authored by unknown's avatar unknown
Browse files

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

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


sql/lock.cc:
  Auto merged
parents a2a1449c cc97be60

sql/lock.cc

+3 −2
Original line number Diff line number Diff line
@@ -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);