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/sql_union.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/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 55c2524ca42..ed77de87fe4 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -296,8 +296,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; + ulong create_options= (first_select_in_union()->options | thd_arg->options | + TMP_TABLE_ALL_COLUMNS) & ~TMP_TABLE_FORCE_MYISAM; /* Force the temporary table to be a MyISAM table if we're going to use fullext functions (MATCH ... AGAINST .. IN BOOLEAN MODE) when reading @@ -310,7 +310,7 @@ bool st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, if (!(table= create_tmp_table(thd_arg, &union_result->tmp_table_param, types, (ORDER*) 0, (bool) union_distinct, 1, - create_options, HA_POS_ERROR, + create_options, HA_POS_ERROR, (char *) tmp_table_alias))) goto err; table->file->extra(HA_EXTRA_WRITE_CACHE); |