From d9ce6e8f2534e894ce7a92e18c9c154fdf201da9 Mon Sep 17 00:00:00 2001
From: "sergefp@mysql.com" <>
Date: Sun, 7 Aug 2005 21:21:30 +0000
Subject: 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).

---
 sql/item_sum.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'sql/item_sum.cc')

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);
-- 
cgit v1.2.1