Commit 76344883 authored by joerg@mysql.com's avatar joerg@mysql.com
Browse files

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

parents f962fa5b 9a12ddcf

sql/log.cc

+5 −1
Original line number Diff line number Diff line
@@ -1882,7 +1882,11 @@ bool MYSQL_LOG::write(THD *thd, IO_CACHE *cache, Log_event *commit_event) 
      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);

  }