bk commit into 5.0 tree (cbell:1.2396)

[cbell]

Below is the list of changes that have just been committed into a local
5.0 repository of cbell. When cbell 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@stripped, 2007-02-23 13:00:08-05:00, cbell@mysql_cab_desk. +1 -0
  Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
  into  mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_20141
  MERGE: 1.2391.2.1

  sql/log.cc@stripped, 2007-02-23 13:00:04-05:00, cbell@mysql_cab_desk. +0 -0
    Auto merged
    MERGE: 1.200.1.1

# 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:	cbell
# Host:	mysql_cab_desk.
# Root:	C:/source/c++/mysql-5.0_BUG_20141/RESYNC

--- 1.201/sql/log.cc	2007-02-23 13:00:18 -05:00
+++ 1.202/sql/log.cc	2007-02-23 13:00:18 -05:00
@@ -1577,13 +1577,13 @@
   return err;
 }
 
-void MYSQL_LOG::start_union_events(THD *thd)
+void MYSQL_LOG::start_union_events(THD *thd, query_id_t query_id_param)
 {
   DBUG_ASSERT(!thd->binlog_evt_union.do_union);
   thd->binlog_evt_union.do_union= TRUE;
   thd->binlog_evt_union.unioned_events= FALSE;
   thd->binlog_evt_union.unioned_events_trans= FALSE;
-  thd->binlog_evt_union.first_query_id= thd->query_id;
+  thd->binlog_evt_union.first_query_id= query_id_param;
 }
 
 void MYSQL_LOG::stop_union_events(THD *thd)