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

Cleanups & safety fixes

Browse Source
This commit is contained in:
monty@mysql.com
2004-03-25 22:11:22 +02:00
parent eb91f7b478
commit 1448199bd7
13 changed files with 192 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_union.cc
View File

@ -150,6 +150,9 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
JOIN *join= new JOIN(thd_arg, sl->item_list,
sl->options | thd_arg->options | additional_options,
tmp_result);
if (!join)
goto err;
thd_arg->lex->current_select= sl;
offset_limit_cnt= sl->offset_limit;
select_limit_cnt= sl->select_limit+sl->offset_limit;
@ -178,6 +181,7 @@ int st_select_lex_unit::prepare(THD *thd_arg, select_result *sel_result,
Item *item_tmp;
while ((item_tmp= it++))
{
/* Error's in 'new' will be detected after loop */
types.push_back(new Item_type_holder(thd_arg, item_tmp));
}
@ -384,7 +388,10 @@ int st_select_lex_unit::exec()
allocate JOIN for fake select only once (privent
mysql_select automatic allocation)
*/
fake_select_lex->join= new JOIN(thd, item_list, thd->options, result);
if (!(fake_select_lex->join= new JOIN(thd, item_list, thd->options,
result)))
DBUG_RETURN(-1);
/*
Fake st_select_lex should have item list for correctref_array
allocation.