mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
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 ...
This commit is contained in:
@ -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))
|
||||
{
|
||||
|
Reference in New Issue
Block a user