bk commit into 5.1 tree (aelkin:1.2303)

[Andrei Elkin]

Below is the list of changes that have just been committed into a local
5.1 repository of elkin. When elkin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2303 06/04/09 19:38:59 aelkin@stripped +2 -0
  Merge mysql.com:/usr_rh9/home/elkin.rh9/MySQL/BARE/5.0
  into  mysql.com:/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1

  sql/log.cc
    1.202 06/04/09 19:38:52 aelkin@stripped +0 -0
    Auto merged

  mysql-test/r/rpl_temporary.result
    1.24 06/04/09 19:38:51 aelkin@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	aelkin
# Host:	dsl-hkigw8-feb0de00-199.dhcp.inet.fi
# Root:	/usr_rh9/home/elkin.rh9/MySQL/Merge/5.1/RESYNC

--- 1.201/sql/log.cc	2006-03-29 17:28:33 +03:00
+++ 1.202/sql/log.cc	2006-04-09 19:38:52 +03:00
@@ -3122,7 +3122,11 @@
       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);
   }

--- 1.23/mysql-test/r/rpl_temporary.result	2006-04-08 18:51:23 +03:00
+++ 1.24/mysql-test/r/rpl_temporary.result	2006-04-09 19:38:51 +03:00
@@ -78,6 +78,7 @@
 create table t5 (f int);
 drop table if exists t999;
 create temporary table t999 (f int);
+LOAD DATA INFILE "./tmp/bl_dump_thread_id" into table t999;
 drop table t999;
 insert into t4 values (1);
 kill `select id from information_schema.processlist where command='Binlog Dump'`;