summaryrefslogtreecommitdiff
path: root/sql/sql_class.h
diff options
context:
space:
mode:
authorcbell/Chuck@mysql_cab_desk. <>2007-02-26 14:30:44 -0500
committercbell/Chuck@mysql_cab_desk. <>2007-02-26 14:30:44 -0500
commite9481608c3c692ef674de9a481fe28dd146acfc8 (patch)
tree98b999d0b64cff83861d0e19ff89a040e7969f07 /sql/sql_class.h
parentaafc285d75c5bbba3afca5bb717aa7b290ac2047 (diff)
parent9017512bd68cf70fecde0b5ad32e33cc0cd9b8f8 (diff)
downloadmariadb-git-e9481608c3c692ef674de9a481fe28dd146acfc8.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
Diffstat (limited to 'sql/sql_class.h')
-rw-r--r--sql/sql_class.h2
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);