database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch 'github/10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2018-02-06 14:50:50 +01:00
parent 60f51af755 0c25e58db6
commit 4771ae4b22
466 changed files with 9366 additions and 3618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sql/sql_derived.cc
View File

@ -369,7 +369,11 @@ bool mysql_derived_merge(THD *thd, LEX *lex, TABLE_LIST *derived)
derived->get_unit()));
if (derived->merged)
{
DBUG_PRINT("info", ("Irreversibly merged: exit"));
DBUG_RETURN(FALSE);
}
if (dt_select->uncacheable & UNCACHEABLE_RAND)
{
@ -745,6 +749,17 @@ bool mysql_derived_prepare(THD *thd, LEX *lex, TABLE_LIST *derived)
}
unit->derived= derived;
/*
Above cascade call of prepare is important for PS protocol, but after it
is called we can check if we really need prepare for this derived
*/
if (derived->merged)
{
DBUG_PRINT("info", ("Irreversibly merged: exit"));
DBUG_RETURN(FALSE);
}
derived->fill_me= FALSE;
if (!(derived->derived_result= new (thd->mem_root) select_union(thd)))
@ -886,6 +901,11 @@ bool mysql_derived_optimize(THD *thd, LEX *lex, TABLE_LIST *derived)
DBUG_PRINT("enter", ("Alias: '%s' Unit: %p",
(derived->alias ? derived->alias : "<NULL>"),
derived->get_unit()));
if (derived->merged)
{
DBUG_PRINT("info", ("Irreversibly merged: exit"));
DBUG_RETURN(FALSE);
}
if (unit->optimized)
DBUG_RETURN(FALSE);