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

after-review changes (577 SCRUM)

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2003-02-02 23:30:01 +02:00
parent 291f8a225a
commit 62902a3b4b
17 changed files with 151 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_union.cc
View File

@ -25,11 +25,11 @@
#include "sql_select.h"
int mysql_union(THD *thd, LEX *lex, select_result *result,
SELECT_LEX_UNIT *unit, bool tables_OK)
SELECT_LEX_UNIT *unit, bool tables_and_fields_initied)
{
DBUG_ENTER("mysql_union");
int res= 0;
if (!(res= unit->prepare(thd, result, tables_OK)))
if (!(res= unit->prepare(thd, result, tables_and_fields_initied)))
res= unit->exec();
res|= unit->cleanup();
DBUG_RETURN(res);
@ -109,7 +109,7 @@ bool select_union::flush()
}
int st_select_lex_unit::prepare(THD *thd, select_result *result,
bool tables_OK)
bool tables_and_fields_initied)
{
DBUG_ENTER("st_select_lex_unit::prepare");
@ -132,8 +132,9 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result,
if (found_rows_for_union)
first_select()->options ^= OPTION_FOUND_ROWS;
}
if (tables_OK)
if (tables_and_fields_initied)
{
// Item list and tables will be initialized by mysql_derived
item_list= sl->item_list;
}
else
@ -153,7 +154,7 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result,
setup_fields(thd, sl->ref_pointer_array, first_table, item_list,
0, 0, 1))
goto err;
tables_OK= 1;
tables_and_fields_initied= 1;
}
bzero((char*) &tmp_table_param,sizeof(tmp_table_param));
@ -201,8 +202,8 @@ int st_select_lex_unit::prepare(THD *thd, select_result *result,
(ORDER*) sl->group_list.first,
sl->having,
(ORDER*) NULL,
sl, this, 0, tables_OK);
tables_OK= 0;
sl, this, 0, tables_and_fields_initied);
tables_and_fields_initied= 0;
if (res | thd->is_fatal_error)
goto err;
}
@ -231,7 +232,7 @@ int st_select_lex_unit::exec()
DBUG_ENTER("st_select_lex_unit::exec");
SELECT_LEX_NODE *lex_select_save= thd->lex.current_select;
if (executed && !(dependent||uncacheable))
if (executed && !(dependent || uncacheable))
DBUG_RETURN(0);
executed= 1;