diff options
| author | Igor Babaev <igor@askmonty.org> | 2013-08-21 12:34:58 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2013-08-21 12:34:58 -0700 |
| commit | 2ead54d0fba84927a9a603b8f431039cc171a561 (patch) | |
| tree | 47ac9a26d3416cc2d437b2449057f181302c25ec /sql/opt_subselect.cc | |
| parent | 5d5f3a1ee8f4d05cfa4418624d185fb3d9a0cab8 (diff) | |
| parent | f8af4423b4bd9bb2978668b21506677f5dcac873 (diff) | |
| download | mariadb-git-2ead54d0fba84927a9a603b8f431039cc171a561.tar.gz | |
Merge
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index 773897474f3..85df9a47152 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -5211,10 +5211,12 @@ bool setup_jtbm_semi_joins(JOIN *join, List<TABLE_LIST> *join_list, { eq_cond= new Item_func_eq(subq_pred->left_expr->element_index(i), new_sink->row[i]); - if (!eq_cond || eq_cond->fix_fields(join->thd, &eq_cond)) + if (!eq_cond) DBUG_RETURN(1); - (*join_where)= and_items(*join_where, eq_cond); + if (!((*join_where)= and_items(*join_where, eq_cond)) || + (*join_where)->fix_fields(join->thd, join_where)) + DBUG_RETURN(1); } } else |