Merge mysql.com:/users/lthalmann/bk/mysql-5.0-release-bug18116

into mysql.com:/users/lthalmann/bk/mysql-5.0

Merge mysql.com:/users/lthalmann/bk/mysql-5.0-release-bug18116
into mysql.com:/users/lthalmann/bk/mysql-5.0
ab71e2ac · lars@mysql.com · 010a8a57 · 9a12ddcf · ab71e2ac
Commit ab71e2ac authored Apr 09, 2006 by lars@mysql.com
Show 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);
  }