diff options
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index cdbe8a986b2..72c96e81682 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -289,6 +289,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, List_iterator_fast<Item> tp(types); Query_arena *arena= thd->current_arena; Item *type; + ulonglong create_options; while ((type= tp++)) { @@ -300,8 +301,8 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, } } - ulong create_options= (first_select_in_union()->options | thd_arg->options | - TMP_TABLE_ALL_COLUMNS) & ~TMP_TABLE_FORCE_MYISAM; + create_options= (first_select_in_union()->options | thd_arg->options | + TMP_TABLE_ALL_COLUMNS); /* Force the temporary table to be a MyISAM table if we're going to use fullext functions (MATCH ... AGAINST .. IN BOOLEAN MODE) when reading |