Commit 25201f23 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/mydev/mysql-4.1 

into  mysql.com:/home/mydev/mysql-4.1-4100
parents 1ab80cf4 b9e04cf1

mysql-test/r/fulltext_order_by.result

+4 −0
Original line number Diff line number Diff line
@@ -163,6 +163,10 @@ text id betreff 
(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

mysql-test/t/fulltext_order_by.test

+5 −0
Original line number Diff line number Diff line
@@ -138,6 +138,11 @@ order by 
(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;

sql/sql_union.cc

+2 −3
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ st_select_lex_unit::init_prepare_fake_select_lex(THD *thd) 
    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 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result, 
    /*

      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;