diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-10-15 23:38:29 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-10-15 23:38:29 +0200 |
| commit | 6aad537a6aa1381b73e87e53a5a17eda4ef1d452 (patch) | |
| tree | 9366ff2dea102dc28d90ffad1cf8dff3039650e0 /mysys/array.c | |
| parent | 8ea19fa73e86a3c27917a92affd6a9e43763c7ce (diff) | |
| parent | c7d32876f345785580a7cf286542ccf390b4e1fa (diff) | |
| download | mariadb-git-6aad537a6aa1381b73e87e53a5a17eda4ef1d452.tar.gz | |
Merge MySQL 5.1.39 into MariaDB 5.1.
Diffstat (limited to 'mysys/array.c')
| -rw-r--r-- | mysys/array.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/array.c b/mysys/array.c index 743bf4ef302..a18223e9cae 100644 --- a/mysys/array.c +++ b/mysys/array.c @@ -61,7 +61,7 @@ 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= (char*) my_malloc_ci(element_size*init_alloc, MYF(0)))) + if (!(array->buffer= (uchar*) my_malloc_ci(element_size*init_alloc, MYF(0)))) array->max_element=0; DBUG_RETURN(FALSE); } |