diff options
| author | unknown <sergefp@mysql.com> | 2005-08-07 21:21:30 +0000 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-08-07 21:21:30 +0000 |
| commit | d7086c4a0cc5d6240b1a0ad2b4eb83a935fadd1e (patch) | |
| tree | a87e66f1c8dabfecf46c71ae6ca088b691691813 /sql/item_sum.cc | |
| parent | f3ce475dcec23a51cff93aaa1bbaa27eba978b05 (diff) | |
| download | mariadb-git-d7086c4a0cc5d6240b1a0ad2b4eb83a935fadd1e.tar.gz | |
BUG#11869:part 2: post-review fixes: merging into 5.0
We're out of bits in st_select_lex->options so make TMP_TABLE_FORCE_MYISAM ==
OPTION_FOUND_COMMENT (the latter is not used by create_tmp_table).
mysql-test/r/create.result:
Updated the test result
mysql-test/r/fulltext_order_by.result:
Drop all tables this test uses
mysql-test/t/fulltext_order_by.test:
Drop all tables this test uses
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index b669a8c426d..3ba9cd10831 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -2275,7 +2275,8 @@ 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, + (select_lex->options | thd->options) & + ~TMP_TABLE_FORCE_MYISAM, HA_POS_ERROR, (char*)""))) return TRUE; table->file->extra(HA_EXTRA_NO_ROWS); // Don't update rows @@ -3057,7 +3058,8 @@ 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, + (select_lex->options | thd->options) & + ~TMP_TABLE_FORCE_MYISAM, HA_POS_ERROR, (char*) ""))) DBUG_RETURN(TRUE); table->file->extra(HA_EXTRA_NO_ROWS); |