diff options
| author | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-02-26 14:30:44 -0500 |
|---|---|---|
| committer | unknown <cbell/Chuck@mysql_cab_desk.> | 2007-02-26 14:30:44 -0500 |
| commit | 1636d00fa7fd6ff2b8d5a0117efc44d7997860fb (patch) | |
| tree | 98b999d0b64cff83861d0e19ff89a040e7969f07 /sql/sql_class.h | |
| parent | dc8b4bacc5bb76540cb33cfdcaecf916b716fa89 (diff) | |
| parent | 3a8a519acb3cb44ce861375a3343b04dc812ee66 (diff) | |
| download | mariadb-git-1636d00fa7fd6ff2b8d5a0117efc44d7997860fb.tar.gz | |
Merge cbell@bk-internal.mysql.com:/home/bk/mysql-5.0-rpl
into mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl
sql/item_func.cc:
Auto merged
sql/log.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
Diffstat (limited to 'sql/sql_class.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index 6dc477f9ff9..11b350751ba 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -311,7 +311,7 @@ public: bool write(Log_event* event_info); // binary log write bool write(THD *thd, IO_CACHE *cache, Log_event *commit_event); - void start_union_events(THD *thd); + void start_union_events(THD *thd, query_id_t query_id_param); void stop_union_events(THD *thd); bool is_query_in_union(THD *thd, query_id_t query_id_param); |