database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Post-merge fixes.

Browse Source 
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.
This commit is contained in:
unknown
2005-07-14 20:02:37 +04:00
parent a1a05ac85c
commit d12fd45d72
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/fulltext_order_by.result
View File

@ -158,5 +158,5 @@ where
match(c.beitrag) against ('+abc' in boolean mode) match(c.beitrag) against ('+abc' in boolean mode)
order by order by
match(betreff) against ('+abc' in boolean mode) desc; 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; drop table t1,t2,t3;

2
mysql-test/t/fulltext_order_by.test
View File

@ -117,6 +117,8 @@ where
order by order by
match(b.betreff) against ('+abc' in boolean mode) desc; match(b.betreff) against ('+abc' in boolean mode) desc;
-- todo psergey: fix
--error 1214
select a.text, b.id, b.betreff select a.text, b.id, b.betreff
from from
t2 a inner join t3 b on a.id = b.forum inner join t2 a inner join t3 b on a.id = b.forum inner join

2
sql/sql_select.cc
View File

@ -5178,7 +5178,7 @@ static void add_not_null_conds(JOIN *join)
when it is called from make_join_select after this function is when it is called from make_join_select after this function is
called. called.
*/ */
if (notnull->fix_fields(join->thd, join->tables_list, &notnull)) if (notnull->fix_fields(join->thd, &notnull))
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
DBUG_EXECUTE("where",print_where(notnull, DBUG_EXECUTE("where",print_where(notnull,
referred_tab->table->alias);); referred_tab->table->alias););