diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-11-09 15:41:26 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-11-09 15:41:26 +0400 |
| commit | 62333983e4cc72ee68f2b6990b58a59aa81af0fe (patch) | |
| tree | 42184f58f95ccb6a95d95a4f24070f5ab6fc8e08 /sql/sql_derived.cc | |
| parent | 7c85a8d936b1a8bb82ff069f82f5ecf3ff2ab654 (diff) | |
| parent | 0fdb0bdf2769dc4e69d46b342200d3fd333fa3a5 (diff) | |
| download | mariadb-git-62333983e4cc72ee68f2b6990b58a59aa81af0fe.tar.gz | |
Merge remote-tracking branch 'origin/10.1' into 10.2
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 691592c25ea..746913b0154 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); |