diff options
| author | Monty <monty@mariadb.org> | 2017-11-09 23:21:41 +0200 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2017-11-09 23:21:41 +0200 |
| commit | 0bb0d52221af99c46d17486382806caa6dd7338e (patch) | |
| tree | 92b2ddfceaf8df5be6d47774b25fd3006ac5bb35 /sql/sql_derived.cc | |
| parent | 7dbff2c513aeec3b3f3d0fa4952ae97deba22282 (diff) | |
| parent | d40c23570ff1a9ba5aa317b85a32a4b27780b8ab (diff) | |
| download | mariadb-git-0bb0d52221af99c46d17486382806caa6dd7338e.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Conflicts:
mysql-test/r/cte_recursive.result
mysql-test/r/derived_cond_pushdown.result
mysql-test/t/cte_recursive.test
mysql-test/t/derived_cond_pushdown.test
sql/datadict.cc
sql/handler.cc
Diffstat (limited to 'sql/sql_derived.cc')
| -rw-r--r-- | sql/sql_derived.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_derived.cc b/sql/sql_derived.cc index 8dff001d4d0..5554faf7baf 100644 --- a/sql/sql_derived.cc +++ b/sql/sql_derived.cc @@ -468,7 +468,8 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived) // Update used tables cache according to new table map if (derived->on_expr) { - derived->on_expr->fix_after_pullout(parent_lex, &derived->on_expr); + derived->on_expr->fix_after_pullout(parent_lex, &derived->on_expr, + TRUE); fix_list_after_tbl_changes(parent_lex, &derived->nested_join->join_list); } } @@ -641,7 +642,8 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived) SELECT_LEX_UNIT *unit= derived->get_unit(); DBUG_ENTER("mysql_derived_prepare"); bool res= FALSE; - DBUG_PRINT("enter", ("unit %p", unit)); + DBUG_PRINT("enter", ("unit: %p table_list: %p Alias '%s'", + unit, derived, derived->alias)); if (!unit) DBUG_RETURN(FALSE); |