diff options
| author | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-02-26 14:33:58 -0500 |
|---|---|---|
| committer | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-02-26 14:33:58 -0500 |
| commit | f3377aa8947836e355c780ae767ab3573e976afe (patch) | |
| tree | fa283e662a33cb4654cb034379a7dc978b28b04a /sql/log.cc | |
| parent | c140b92cfb1de9d0e9374bef96dc2d24ffb6ae8a (diff) | |
| parent | 9f957f1429df804b35eafe468e20b219e8070d91 (diff) | |
| download | mariadb-git-f3377aa8947836e355c780ae767ab3573e976afe.tar.gz | |
Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.1-new-rpl
into mysql_cab_desk.:C:/source/C++/mysql-5.1-new-rpl
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/log.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
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 15cbff16339..f952fbd0d4c 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -3345,13 +3345,13 @@ bool MYSQL_BIN_LOG::flush_and_sync() return err; } -void MYSQL_BIN_LOG::start_union_events(THD *thd) +void MYSQL_BIN_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_BIN_LOG::stop_union_events(THD *thd) |