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 | 8b6185c33b92b8dbb35ac14c17004725b0e696a9 (patch) | |
| tree | a87e66f1c8dabfecf46c71ae6ca088b691691813 /sql/sql_derived.cc | |
| parent | f9f3a0eb71ea59409a4a2920d9b490915d33be3e (diff) | |
| download | mariadb-git-8b6185c33b92b8dbb35ac14c17004725b0e696a9.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_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index fc9d15e94c4..afcf7dbd93f 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -142,7 +142,8 @@ int mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *orig_table_list) unit->types, (ORDER*) 0, FALSE, 1, (first_select->options | thd->options | - TMP_TABLE_ALL_COLUMNS), + TMP_TABLE_ALL_COLUMNS) & + ~TMP_TABLE_FORCE_MYISAM, HA_POS_ERROR, orig_table_list->alias))) { |