diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-03 01:37:54 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2017-03-03 01:37:54 +0200 |
| commit | 1acfa942edb72fedcf92dd017ae5fef8694382e5 (patch) | |
| tree | 721fcd9a479ce34633659c936f36fa1e20856620 /sql/sql_derived.cc | |
| parent | cc413ce9a368b930aba5e63c0ab013f7b3ab3c04 (diff) | |
| parent | 5a0fff50f87e20c4e95a84143a0a3bb67e03e29e (diff) | |
| download | mariadb-git-1acfa942edb72fedcf92dd017ae5fef8694382e5.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index f2674cb8dab..af5b016df9d 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -447,6 +447,9 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived) { Item *expr= derived->on_expr; expr= and_conds(expr, dt_select->join ? dt_select->join->conds : 0); + if (expr) + expr->top_level_item(); + if (expr && (derived->prep_on_expr || expr != derived->on_expr)) { derived->on_expr= expr; |