diff options
| author | Michael Widenius <monty@mariadb.org> | 2014-03-13 16:43:11 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2014-03-13 16:43:11 +0200 |
| commit | e63c03db8d620765b7a1bc769150a04a230b9353 (patch) | |
| tree | 889476c5e3cf759c2abde780f91e1c61c3064492 /extra | |
| parent | 70c08df4dc6899991c29c4db3253d8e4efc4ee77 (diff) | |
| parent | 172784965981c7d06ddb50457f0178da25104b9e (diff) | |
| download | mariadb-git-e63c03db8d620765b7a1bc769150a04a230b9353.tar.gz | |
Merge with 10.0-base
Automatic merge, except for server_audit.cc that had to be modified slightly
Changes to xtradb and innobase where ignored was these made no sence for 10.0
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); } |