1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

be sure to call top_level_item() on the new Item_cond_and,

that merges ON and WHERE (BUG#10162)


mysql-test/r/join_outer.result:
  BUG#10162 - ON is merged with WHERE, left join is convered to a regular join
mysql-test/t/join_outer.test:
  BUG#10162 - ON is merged with WHERE, left join is convered to a regular join
This commit is contained in:
unknown
2005-04-27 01:32:44 +02:00
parent 26d95ae4a6
commit e5e73082b1
3 changed files with 30 additions and 0 deletions

View File

@ -7396,6 +7396,7 @@ simplify_joins(JOIN *join, List<TABLE_LIST> *join_list, COND *conds, bool top)
if (conds)
{
conds= and_conds(conds, table->on_expr);
conds->top_level_item();
/* conds is always a new item as both cond and on_expr existed */
DBUG_ASSERT(!conds->fixed);
conds->fix_fields(join->thd, 0, &conds);