summaryrefslogtreecommitdiff
path: root/mysys/array.c
diff options
context:
space:
mode:
Diffstat (limited to 'mysys/array.c')
-rw-r--r--mysys/array.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/array.c b/mysys/array.c
index 164e62bd9f9..83a879768c4 100644
--- a/mysys/array.c
+++ b/mysys/array.c
@@ -61,7 +61,8 @@ my_bool init_dynamic_array2(DYNAMIC_ARRAY *array, uint element_size,
Since the dynamic array is usable even if allocation fails here malloc
should not throw an error
*/
- if (!(array->buffer= (uchar*) my_malloc(element_size*init_alloc, MYF(0))))
+ if (init_alloc &&
+ !(array->buffer= (uchar*) my_malloc(element_size*init_alloc, MYF(0))))
array->max_element=0;
DBUG_RETURN(FALSE);
}