diff options
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index 2d80a19aa55..e86d4f0d8ba 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2291,8 +2291,7 @@ bool Item_sum_count_distinct::setup(THD *thd) DBUG_ASSERT(table == 0); if (!(table= create_tmp_table(thd, tmp_table_param, list, (ORDER*) 0, 1, 0, - (select_lex->options | thd->options) & - ~TMP_TABLE_FORCE_MYISAM, + (select_lex->options | thd->options), HA_POS_ERROR, (char*)""))) return TRUE; table->file->extra(HA_EXTRA_NO_ROWS); // Don't update rows @@ -3074,8 +3073,7 @@ bool Item_func_group_concat::setup(THD *thd) */ if (!(table= create_tmp_table(thd, tmp_table_param, all_fields, (ORDER*) 0, 0, TRUE, - (select_lex->options | thd->options) & - ~TMP_TABLE_FORCE_MYISAM, + (select_lex->options | thd->options), HA_POS_ERROR, (char*) ""))) DBUG_RETURN(TRUE); table->file->extra(HA_EXTRA_NO_ROWS); |