bk commit into 4.1 tree (sergefp:1.2362) 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.2362 05/08/07 21:03:45 sergefp@stripped +3 -0
  BUG#11869: part2: post-review fixes:
  In init_prepare_fake_select_lex() don't empty ftfunc_list. UNION's ORDER BY clause may 
  contain MATCH(...), for which fix_index() should be called.

  sql/sql_union.cc
    1.143 05/08/07 21:03:38 sergefp@stripped +2 -3
    BUG#11869: part2: post-review fixes:
    In init_prepare_fake_select_lex() don't empty ftfunc_list. UNION's ORDER BY clause may

    contain MATCH(...), for which fix_index() should be called.

  mysql-test/t/fulltext_order_by.test
    1.19 05/08/07 21:03:38 sergefp@stripped +5 -0
    BUG#11869 part2 : added another test case

  mysql-test/r/fulltext_order_by.result
    1.17 05/08/07 21:03:38 sergefp@stripped +4 -0
    BUG#11869 part2 : added another test case

# 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.142/sql/sql_union.cc	2005-08-06 21:08:24 +00:00
+++ 1.143/sql/sql_union.cc	2005-08-07 21:03:38 +00:00
@@ -132,8 +132,6 @@
     options_tmp&= ~OPTION_FOUND_ROWS;
   else if (found_rows_for_union && !thd->lex->describe)
     options_tmp|= OPTION_FOUND_ROWS;
-  fake_select_lex->ftfunc_list_alloc.empty();
-  fake_select_lex->ftfunc_list= &fake_select_lex->ftfunc_list_alloc;
   fake_select_lex->table_list.link_in_list((byte *)&result_table_list,
 					   (byte **)
 					   &result_table_list.next);
@@ -302,7 +300,8 @@
     /*
       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.
+      from it (this should be removed in 5.2 when fulltext search is moved 
+      out of MyISAM).
     */
     if (global_parameters->ftfunc_list->elements)
       create_options= create_options | TMP_TABLE_FORCE_MYISAM;

--- 1.16/mysql-test/r/fulltext_order_by.result	2005-08-06 21:08:23 +00:00
+++ 1.17/mysql-test/r/fulltext_order_by.result	2005-08-07 21:03:38 +00:00
@@ -163,6 +163,10 @@
 (select 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) union 
+(select b.id, b.betreff from t3 b) 
+order by match(betreff) against ('+abc') desc;
+ERROR HY000: Can't find FULLTEXT index matching the column list
 select distinct b.id, b.betreff from t3 b 
 order by match(betreff) against ('+abc' in boolean mode) desc;
 id	betreff

--- 1.18/mysql-test/t/fulltext_order_by.test	2005-08-06 21:08:24 +00:00
+++ 1.19/mysql-test/t/fulltext_order_by.test	2005-08-07 21:03:38 +00:00
@@ -138,6 +138,11 @@
 (select b.id, b.betreff from t3 b) 
 order by match(betreff) against ('+abc' in boolean mode) desc;
 
+--error 1191
+(select b.id, b.betreff from t3 b) union 
+(select b.id, b.betreff from t3 b) 
+order by match(betreff) against ('+abc') desc;
+
 select distinct b.id, b.betreff from t3 b 
 order by match(betreff) against ('+abc' in boolean mode) desc;