diff options
| author | cbell/Chuck@mysql_cab_desk. <> | 2007-02-23 13:00:08 -0500 |
|---|---|---|
| committer | cbell/Chuck@mysql_cab_desk. <> | 2007-02-23 13:00:08 -0500 |
| commit | 9017512bd68cf70fecde0b5ad32e33cc0cd9b8f8 (patch) | |
| tree | 2f92856c7d6f232d10238e00a0800326453095fb /sql/log.cc | |
| parent | 2f75c9cd69412de5d3736e775dd302ebdbc1e36d (diff) | |
| parent | 4c6ced9fc581366fd5a26db647bf122c9421d860 (diff) | |
| download | mariadb-git-9017512bd68cf70fecde0b5ad32e33cc0cd9b8f8.tar.gz | |
Merge mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
into mysql_cab_desk.:C:/source/c++/mysql-5.0_BUG_20141
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/log.cc b/sql/log.cc index aef8e2eff2c..d7001c1e7b4 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -1577,13 +1577,13 @@ bool MYSQL_LOG::flush_and_sync() 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) |