Merge mysql.com:/M50/clone-5.0 into mysql.com:/M50/mysql-5.0

76344883 · joerg@mysql.com · f962fa5b · 9a12ddcf · 76344883
Commit 76344883 authored Apr 07, 2006 by joerg@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

sql/log.cc sql/log.cc +5 -1

No files found.
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -1882,7 +1882,11 @@ DBUG_skip_commit:
      rotate binlog, if necessary.
    */
    if (commit_event->get_type_code() == XID_EVENT)
-      thread_safe_increment(prepared_xids, &LOCK_prep_xids);
+    {
+      pthread_mutex_lock(&LOCK_prep_xids);
+      prepared_xids++;
+      pthread_mutex_unlock(&LOCK_prep_xids);
+    }
    else
      rotate_and_purge(RP_LOCK_LOG_IS_ALREADY_LOCKED);
  }