1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

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.
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

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
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););