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

correct the NULL-pointer test

Browse Source
This commit is contained in:
Sergei Golubchik 2015-08-04 23:42:44 +02:00
parent 877de3af28
commit fa51f70dc6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sql/item_sum.cc
View File

@ -3518,9 +3518,10 @@ bool Item_func_group_concat::setup(THD *thd)
{ {
uint n_elems= arg_count_order + all_fields.elements; uint n_elems= arg_count_order + all_fields.elements;
ref_pointer_array= static_cast<Item**>(thd->alloc(sizeof(Item*) * n_elems)); ref_pointer_array= static_cast<Item**>(thd->alloc(sizeof(Item*) * n_elems));
if (!ref_pointer_array)
DBUG_RETURN(TRUE);
memcpy(ref_pointer_array, args, arg_count * sizeof(Item*)); memcpy(ref_pointer_array, args, arg_count * sizeof(Item*));
if (!ref_pointer_array || if (setup_order(thd, ref_pointer_array, context->table_list, list,
setup_order(thd, ref_pointer_array, context->table_list, list,
all_fields, *order)) all_fields, *order))
DBUG_RETURN(TRUE); DBUG_RETURN(TRUE);
} }