database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.0' into 10.1

Browse Source
This commit is contained in:
Alexander Barkov
2017-11-09 14:05:53 +04:00
parent 644ffdeb92 c2c93fc6e4
commit 0fdb0bdf27
18 changed files with 190 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_derived.cc
View File

@ -466,7 +466,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);
}
}
@ -636,7 +637,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 0x%lx", (ulong) unit));
DBUG_PRINT("enter", ("unit: %p table_list: %p Alias '%s'",
unit, derived, derived->alias));
// Skip already prepared views/DT
if (!unit || unit->prepared ||