diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-03-11 17:49:09 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-03-11 17:49:09 +0200 |
| commit | 172784965981c7d06ddb50457f0178da25104b9e (patch) | |
| tree | b0759d12a5abd3acf49ac11d4f601d46bc6c5e0a /extra | |
| parent | 23af77d26e3ff336e415a5d8bf3f4c4a7bc84a18 (diff) | |
| parent | 800a278fd09c353a02f02c9c32074d3807861967 (diff) | |
| download | mariadb-git-172784965981c7d06ddb50457f0178da25104b9e.tar.gz | |
Merge with 5.5
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/replace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/replace.c b/extra/replace.c index c2dcc9f50b5..c4105e45973 100644 --- a/extra/replace.c +++ b/extra/replace.c @@ -265,7 +265,7 @@ static int insert_pointer_name(reg1 POINTER_ARRAY *pa,char * name) if (!(pa->str= (uchar*) my_malloc((uint) (PS_MALLOC-MALLOC_OVERHEAD), MYF(MY_WME)))) { - my_free((char*) pa->typelib.type_names); + my_free((void*) pa->typelib.type_names); DBUG_RETURN (-1); } pa->max_count=(PC_MALLOC-MALLOC_OVERHEAD)/(sizeof(uchar*)+ @@ -327,7 +327,7 @@ static void free_pointer_array(reg1 POINTER_ARRAY *pa) if (pa->typelib.count) { pa->typelib.count=0; - my_free((char*) pa->typelib.type_names); + my_free((void*) pa->typelib.type_names); pa->typelib.type_names=0; my_free(pa->str); } |