diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2014-04-17 08:22:54 +0300 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2014-04-17 08:22:54 +0300 |
| commit | 271ea3c86eb894fd46145b5c09610a76397a47f6 (patch) | |
| tree | d796937447fda6488c812c49df7b12323fd08555 /extra | |
| parent | 2f46e5b9fc51f0c427634f935b7d922047023628 (diff) | |
| parent | 41a2ca5c16636c12d5c2adce70ec7ddb7a2fc711 (diff) | |
| download | mariadb-git-271ea3c86eb894fd46145b5c09610a76397a47f6.tar.gz | |
Merge lp:maria/10.0 up to mariadb-10.0.10 revision 4140.
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); } |