diff options
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index f8025cdf701..bb2ab527754 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -1072,7 +1072,7 @@ st_select_lex_unit::init_prepare_fake_select_lex(THD *thd_arg, bool st_select_lex_unit::prepare_join(THD *thd_arg, SELECT_LEX *sl, select_result *tmp_result, - ulong additional_options, + ulonglong additional_options, bool is_union_select) { DBUG_ENTER("st_select_lex_unit::prepare_join"); @@ -1278,7 +1278,7 @@ bool init_item_int(THD* thd, Item_int* &item) bool st_select_lex_unit::prepare(TABLE_LIST *derived_arg, select_result *sel_result, - ulong additional_options) + ulonglong additional_options) { SELECT_LEX *lex_select_save= thd->lex->current_select; SELECT_LEX *sl, *first_sl= first_select(); |