diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-04-08 10:36:34 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-04-08 10:36:34 -0400 |
| commit | 421326310168e2b0a83eddcf9520336e1d58ea42 (patch) | |
| tree | 9ec49ac74c451cf03581a619eb92a7afae1c5eef /extra | |
| parent | 9d2e90f379654fb65c0eab006213d772302bcff7 (diff) | |
| parent | 41a2ca5c16636c12d5c2adce70ec7ddb7a2fc711 (diff) | |
| download | mariadb-git-421326310168e2b0a83eddcf9520336e1d58ea42.tar.gz | |
Merging mariadb-10.0.10.
* bzr merge -rtag:mariadb-10.0.10 maria/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); } |