diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-11-13 14:07:58 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-11-13 14:07:58 +0100 |
| commit | bdd883ed9a68ff1e82528cc6b33316d98894cfd2 (patch) | |
| tree | 93081c72225d399ac93ae0d8bb301a13cfc9a50c /sql/opt_subselect.cc | |
| parent | 2cba9e0cdccfac6f93a54e2ba12eb9926cfaa0a1 (diff) | |
| parent | f3a78f392dad24391c19464731833e2bdf19bdef (diff) | |
| download | mariadb-git-bdd883ed9a68ff1e82528cc6b33316d98894cfd2.tar.gz | |
5.5. merge
Diffstat (limited to 'sql/opt_subselect.cc')
| -rw-r--r-- | sql/opt_subselect.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/opt_subselect.cc b/sql/opt_subselect.cc index de5448ace63..0daf7aee3a9 100644 --- a/sql/opt_subselect.cc +++ b/sql/opt_subselect.cc @@ -437,9 +437,7 @@ Currently, solution #2 is implemented. static bool subquery_types_allow_materialization(Item_in_subselect *in_subs); -static bool replace_where_subcondition(JOIN *join, Item **expr, - Item *old_cond, Item *new_cond, - bool do_fix_fields); +static bool replace_where_subcondition(JOIN *, Item **, Item *, Item *, bool); static int subq_sj_candidate_cmp(Item_in_subselect* el1, Item_in_subselect* el2, void *arg); static bool convert_subq_to_sj(JOIN *parent_join, Item_in_subselect *subq_pred); @@ -1313,7 +1311,7 @@ static bool replace_where_subcondition(JOIN *join, Item **expr, } else if (item->type() == Item::COND_ITEM) { - DBUG_ASSERT(!(*expr)->fixed); + DBUG_ASSERT(!do_fix_fields || !(*expr)->fixed); replace_where_subcondition(join, li.ref(), old_cond, new_cond, do_fix_fields); |