Commit d12fd45d authored by unknown's avatar unknown
Browse files

Post-merge fixes. 


mysql-test/r/fulltext_order_by.result:
  A post-merge fix.
mysql-test/t/fulltext_order_by.test:
  A post-merge fix (a different plan is chosen for a query in 5.0)
sql/sql_select.cc:
  Post-merge fix.
parent a1a05ac8

mysql-test/r/fulltext_order_by.result

+1 −1
Original line number Diff line number Diff line
@@ -158,5 +158,5 @@ where 
match(c.beitrag) against ('+abc' in boolean mode)

order by 

match(betreff) against ('+abc' in boolean mode) desc;

text	id	betreff

ERROR HY000: The used table type doesn't support FULLTEXT indexes

drop table t1,t2,t3;

mysql-test/t/fulltext_order_by.test

+2 −0
Original line number Diff line number Diff line
@@ -117,6 +117,8 @@ where 
order by 

  match(b.betreff) against ('+abc' in boolean mode) desc;



-- todo psergey: fix

--error 1214 

select a.text, b.id, b.betreff

from 

  t2 a inner join t3 b on a.id = b.forum inner join

sql/sql_select.cc

+1 −1
Original line number Diff line number Diff line
@@ -5178,7 +5178,7 @@ static void add_not_null_conds(JOIN *join) 
            when it is called from make_join_select after this function is 

            called.

          */

          if (notnull->fix_fields(join->thd, join->tables_list, &notnull))

          if (notnull->fix_fields(join->thd, &notnull))

            DBUG_VOID_RETURN;

          DBUG_EXECUTE("where",print_where(notnull,

                                           referred_tab->table->alias););