bk commit into 4.1 tree (sergefp:1.2357) BUG#11869

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
4.1 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2357 05/08/06 21:08:28 sergefp@stripped +5 -0
  BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
  When creating temporary table for UNION, pass TMP_TABLE_FORCE_MYISAM flag to 
  create_tmp_table if we will be using fulltext function(s) when reading from the 
  temp. table.

  sql/sql_union.cc
    1.142 05/08/06 21:08:24 sergefp@stripped +12 -4
    BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
    When creating temporary table for UNION, pass TMP_TABLE_FORCE_MYISAM flag to 
    create_tmp_table if we will be using fulltext function(s) when reading from the 
    temp. table.

  sql/sql_select.cc
    1.427 05/08/06 21:08:24 sergefp@stripped +1 -1
    BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
    In create_tmp_table(), honor the TMP_TABLE_FORCE_MYISAM flag

  sql/mysql_priv.h
    1.363 05/08/06 21:08:24 sergefp@stripped +6 -0
    BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT" error):
    Added TMP_TABLE_FORCE_MYISAM flag

  mysql-test/t/fulltext_order_by.test
    1.18 05/08/06 21:08:24 sergefp@stripped +11 -0
    Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT"
error)

  mysql-test/r/fulltext_order_by.result
    1.16 05/08/06 21:08:23 sergefp@stripped +10 -0
    Testcase for BUG#11869 (cont'd, eliminating "table type doesn't support FULLTEXT"
error)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-4.1-bug11869-part2

--- 1.362/sql/mysql_priv.h	2005-08-04 10:22:35 +00:00
+++ 1.363/sql/mysql_priv.h	2005-08-06 21:08:24 +00:00
@@ -215,6 +215,12 @@
    in the user query has requested */
 #define SELECT_ALL			(1L << 29)
 
+/* 
+  Force the used temporary table to be a MyISAM table (because we will use
+  fulltext functions when reading from it.
+*/
+#define TMP_TABLE_FORCE_MYISAM          (1L << 30) 
+
 /* If set to 0, then the thread will ignore all warnings with level notes.
    Set by executing SET SQL_NOTES=1 */
 #define OPTION_SQL_NOTES                (1L << 31)

--- 1.426/sql/sql_select.cc	2005-08-02 18:58:21 +00:00
+++ 1.427/sql/sql_select.cc	2005-08-06 21:08:24 +00:00
@@ -5290,7 +5290,7 @@
   /* 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->db_type=DB_TYPE_MYISAM);
     if (group &&

--- 1.141/sql/sql_union.cc	2005-03-30 07:13:21 +00:00
+++ 1.142/sql/sql_union.cc	2005-08-06 21:08:24 +00:00
@@ -296,15 +296,23 @@
         goto err;
       }
     }
+    
+    ulong create_options= first_select_in_union()->options | thd_arg->options |
+                          TMP_TABLE_ALL_COLUMNS;
+    /*
+      Force the temporary table to be a MyISAM table if we're going to use
+      fullext functions (MATCH ... AGAINST .. IN BOOLEAN MODE) when reading
+      from it.
+    */
+    if (global_parameters->ftfunc_list->elements)
+      create_options= create_options | TMP_TABLE_FORCE_MYISAM;
 
     union_result->tmp_table_param.field_count= types.elements;
     if (!(table= create_tmp_table(thd_arg,
 				  &union_result->tmp_table_param, types,
 				  (ORDER*) 0, (bool) union_distinct, 1, 
-				  (first_select_in_union()->options |
-				   thd_arg->options |
-				   TMP_TABLE_ALL_COLUMNS),
-				  HA_POS_ERROR, (char *) tmp_table_alias)))
+                                  create_options, HA_POS_ERROR, 
+                                  (char *) tmp_table_alias)))
       goto err;
     table->file->extra(HA_EXTRA_WRITE_CACHE);
     table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);

--- 1.15/mysql-test/r/fulltext_order_by.result	2005-07-14 15:19:12 +00:00
+++ 1.16/mysql-test/r/fulltext_order_by.result	2005-08-06 21:08:23 +00:00
@@ -159,4 +159,14 @@
 order by 
 match(betreff) against ('+abc' in boolean mode) desc;
 text	id	betreff
+(select b.id, b.betreff from t3 b) union 
+(select b.id, b.betreff from t3 b) 
+order by match(betreff) against ('+abc' in boolean mode) desc;
+id	betreff
+select distinct b.id, b.betreff from t3 b 
+order by match(betreff) against ('+abc' in boolean mode) desc;
+id	betreff
+select b.id, b.betreff from t3 b group by b.id+1 
+order by match(betreff) against ('+abc' in boolean mode) desc;
+id	betreff
 drop table t1,t2,t3;

--- 1.17/mysql-test/t/fulltext_order_by.test	2005-07-28 00:21:41 +00:00
+++ 1.18/mysql-test/t/fulltext_order_by.test	2005-08-06 21:08:24 +00:00
@@ -133,6 +133,17 @@
 order by 
   match(betreff) against ('+abc' in boolean mode) desc;
 
+# BUG#11869 part2: used table type doesn't support FULLTEXT indexes error
+(select b.id, b.betreff from t3 b) union 
+(select b.id, b.betreff from t3 b) 
+order by match(betreff) against ('+abc' in boolean mode) desc;
+
+select distinct b.id, b.betreff from t3 b 
+order by match(betreff) against ('+abc' in boolean mode) desc;
+
+select b.id, b.betreff from t3 b group by b.id+1 
+order by match(betreff) against ('+abc' in boolean mode) desc;
+
 drop table t1,t2,t3;
 
 # End of 4.1 tests