1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Catch of OOM situation.

Browse Source
This commit is contained in:
Oleksandr Byelkin 2018-06-06 15:27:57 +02:00
parent 72b6d01848
commit 75b4eb5cc9
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_base.cc
View File

@ -6426,6 +6426,9 @@ find_field_in_natural_join(THD *thd, TABLE_LIST *table_ref, const char *name,
column reference. See create_view_field() for details. column reference. See create_view_field() for details.
*/ */
item= nj_col->create_item(thd); item= nj_col->create_item(thd);
if (!item)
DBUG_RETURN(NULL);
/* /*
*ref != NULL means that *ref contains the item that we need to *ref != NULL means that *ref contains the item that we need to
replace. If the item was aliased by the user, set the alias to replace. If the item was aliased by the user, set the alias to

2
sql/table.cc
View File

@ -5252,6 +5252,8 @@ Item *create_view_field(THD *thd, TABLE_LIST *view, Item **field_ref,
Item *item= new Item_direct_view_ref(&view->view->select_lex.context, Item *item= new Item_direct_view_ref(&view->view->select_lex.context,
field_ref, view->alias, field_ref, view->alias,
name, view); name, view);
if (!item)
return NULL;
/* /*
Force creation of nullable item for the result tmp table for outer joined Force creation of nullable item for the result tmp table for outer joined
views/derived tables. views/derived tables.