diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2017-11-13 11:06:18 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2017-11-13 19:09:46 +0300 |
| commit | 497c6add88edae9c7ec6d6d840c0ed65adc016be (patch) | |
| tree | 92eb05976137821fcdf0caf556495a5b55436db0 /sql/sql_derived.cc | |
| parent | d8d725101992d50b00edf149e7ccd7f720b850dc (diff) | |
| parent | a48aa0cd569eda88bef98ed4abe41b0b570fcd51 (diff) | |
| download | mariadb-git-497c6add88edae9c7ec6d6d840c0ed65adc016be.tar.gz | |
System Versioning pre1.0
Merge branch '10.3' into trunk
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 c8aa8702329..2c75d901f34 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); |