diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-12 16:09:06 +0200 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2002-12-12 16:09:06 +0200 |
| commit | 657b311206e5230e540845fedbb388a683d0e917 (patch) | |
| tree | 92a456da0a6fe604493cc93e3cfbb89268ca086e /sql/sql_union.cc | |
| parent | 62ce900c2e116627b05a611e6ad03698b6b18a3b (diff) | |
| download | mariadb-git-657b311206e5230e540845fedbb388a683d0e917.tar.gz | |
derived tables with UNION's ...
Scrum task !!!!!
mysql-test/r/analyse.result:
reverting a fix
mysql-test/r/derived.result:
derived tables with UNION's ...
mysql-test/t/analyse.test:
reverting a fix
mysql-test/t/derived.test:
derived tables with UNION's ...
sql/mysql_priv.h:
derived tables with UNION's ...
sql/sql_analyse.cc:
reverting a fix
sql/sql_derived.cc:
derived tables with UNION's ...
sql/sql_lex.cc:
derived tables with UNION's ...
sql/sql_select.cc:
derived tables with UNION's ...
sql/sql_union.cc:
derived tables with UNION's ...
Diffstat (limited to 'sql/sql_union.cc')
| -rw-r--r-- | sql/sql_union.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 6b0f6b660ac..d3143725878 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -24,10 +24,9 @@ #include "mysql_priv.h" #include "sql_select.h" -int mysql_union(THD *thd, LEX *lex, select_result *result) +int mysql_union(THD *thd, LEX *lex, select_result *result,SELECT_LEX_UNIT *unit) { DBUG_ENTER("mysql_union"); - SELECT_LEX_UNIT *unit= &lex->unit; int res= 0; if (!(res= unit->prepare(thd, result))) res= unit->exec(); @@ -125,8 +124,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result) SELECT_LEX_NODE *lex_select_save= thd->lex.current_select; SELECT_LEX *sl; - if (lex_select_save->linkage != DERIVED_TABLE_TYPE) - thd->lex.current_select=first_select(); + thd->lex.current_select=first_select(); /* Global option */ if (((void*)(global_parameters)) == ((void*)this)) { |