Commit a8ad5d16 authored by unknown's avatar unknown

Merge monty@192.168.0.9:/my/mysql-5.0

into  mysql.com:/my/mysql-5.0


sql/item_func.cc:
  Auto merged
sql/table.cc:
  Auto merged
parents 7d49eca9 44a8096d
No related merge requests found
...@@ -2074,7 +2074,10 @@ void MYSQL_LOG::wait_for_update(THD* thd, bool is_slave) ...@@ -2074,7 +2074,10 @@ void MYSQL_LOG::wait_for_update(THD* thd, bool is_slave)
DBUG_ENTER("wait_for_update"); DBUG_ENTER("wait_for_update");
if (reset_pending) if (reset_pending)
{
pthread_mutex_unlock(&LOCK_log);
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
}
old_msg= thd->enter_cond(&update_cond, &LOCK_log, old_msg= thd->enter_cond(&update_cond, &LOCK_log,
is_slave ? is_slave ?
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment