Merge monty@192.168.0.9:/my/mysql-5.0

into mysql.com:/my/mysql-5.0

Merge monty@192.168.0.9:/my/mysql-5.0
into mysql.com:/my/mysql-5.0
74b3e9ae · monty@mysql.com · 65034c9f · f2f4bf52 · 74b3e9ae
Commit 74b3e9ae authored Nov 02, 2005 by monty@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

sql/log.cc sql/log.cc +3 -0

No files found.
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -2074,7 +2074,10 @@ void MYSQL_LOG::wait_for_update(THD* thd, bool is_slave)
  DBUG_ENTER("wait_for_update");
  
  if (reset_pending)
+  {
+    pthread_mutex_unlock(&LOCK_log);
    DBUG_VOID_RETURN;
+  }

  old_msg= thd->enter_cond(&update_cond, &LOCK_log,
                           is_slave ?