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

postreview fixes

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2004-05-07 00:32:44 +03:00
parent a31452c512
commit c5d8497ee0
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_lex.h
View File

@ -332,7 +332,10 @@ public:
Item_subselect *item; Item_subselect *item;
/* thread handler */ /* thread handler */
THD *thd; THD *thd;
/* fake SELECT_LEX for union processing */ /*
SELECT_LEX for hidden SELECT in onion which process global
ORDER BY and LIMIT
*/
st_select_lex *fake_select_lex; st_select_lex *fake_select_lex;
st_select_lex *union_distinct; /* pointer to the last UNION DISTINCT */ st_select_lex *union_distinct; /* pointer to the last UNION DISTINCT */

3
sql/sql_union.cc
View File

@ -263,7 +263,8 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
union_result->set_table(table); union_result->set_table(table);
thd_arg->lex->current_select= lex_select_save; thd_arg->lex->current_select= lex_select_save;
if (!item_list.elements){ if (!item_list.elements)
{
Statement *stmt= thd->current_statement; Statement *stmt= thd->current_statement;
Statement backup; Statement backup;
if (stmt) if (stmt)