diff options
| author | unknown <sergefp@mysql.com> | 2005-08-07 11:03:54 +0000 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-08-07 11:03:54 +0000 |
| commit | f3ce475dcec23a51cff93aaa1bbaa27eba978b05 (patch) | |
| tree | 418be3169a67dfe101f87edef1ffee62e1c08a2e /sql/sql_select.cc | |
| parent | 2b41471429d9db41d64bfb214e29ba57cb3db381 (diff) | |
| parent | 852dcb75973a612ef5c28645018551ed7bd0055c (diff) | |
| download | mariadb-git-f3ce475dcec23a51cff93aaa1bbaa27eba978b05.tar.gz | |
Manual merge
mysql-test/t/fulltext_order_by.test:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_union.cc:
Auto merged
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index c09a35c1fc0..3f2f72fb768 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -8359,7 +8359,7 @@ create_tmp_table(THD *thd,TMP_TABLE_PARAM *param,List<Item> &fields, /* If result table is small; use a heap */ if (blob_count || using_unique_constraint || (select_options & (OPTION_BIG_TABLES | SELECT_SMALL_RESULT)) == - OPTION_BIG_TABLES) + OPTION_BIG_TABLES ||(select_options & TMP_TABLE_FORCE_MYISAM)) { table->file=get_new_handler(table,table->s->db_type= DB_TYPE_MYISAM); if (group && |