Commit fe0a63b1 authored by unknown's avatar unknown
Browse files

Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into mysql.com:/M51/mysql-5.1
parents 8f9e1d49 9895ca4a

sql/log.cc

+5 −1
Original line number Diff line number Diff line
@@ -3122,7 +3122,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);

  }