diff options
| author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-08-28 12:06:59 -0300 |
|---|---|---|
| committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2009-08-28 12:06:59 -0300 |
| commit | 169f7da04c4ffc43355d5a632a8013bc4caea39b (patch) | |
| tree | 2b40359f8bd844b838b3cb47688b896a6f581f51 /mysys/array.c | |
| parent | 99413e461f5517af071613c985247f6a64b17ccf (diff) | |
| download | mariadb-git-169f7da04c4ffc43355d5a632a8013bc4caea39b.tar.gz | |
Fix for a few assorted compiler warnings.
client/mysql.cc:
Remove leading whitespace.
Remove extra text after #else directive.
client/mysqldump.c:
Function does not take a parameter.
mysys/array.c:
buffer is a uchar pointer.
sql/item.cc:
Assert if it should not happen.
storage/myisam/mi_check.c:
Cast to expected type. This is probably a bug, but it is
casted in a similar way in another part of the code.
storage/ndb/include/mgmapi/ndb_logevent.h:
Apply fix from cluster team.
tests/mysql_client_test.c:
Remove extraneous slash.
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 b65bd28616d..a1c49c2589d 100644 --- a/mysys/array.c +++ b/mysys/array.c @@ -67,7 +67,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); } |