diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-31 09:48:19 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-31 09:48:19 +0100 |
| commit | ab83952f293ea46c00e421c81b81a394c9cae2b4 (patch) | |
| tree | 6a3e995bd1330828a0e988d896bca218863fc74c /extra | |
| parent | 055b62f404ee0a0463ee8ff98a0e24c083b95f1d (diff) | |
| parent | 5267af5e9e5e601d4f4b1ef40730da1e36d38d9d (diff) | |
| download | mariadb-git-ab83952f293ea46c00e421c81b81a394c9cae2b4.tar.gz | |
10.0-base merge
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/comp_err.c | 4 | ||||
| -rw-r--r-- | extra/replace.c | 4 | ||||
| -rw-r--r-- | extra/resolve_stack_dump.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/extra/comp_err.c b/extra/comp_err.c index b4f4b2ea337..fb51377ddc5 100644 --- a/extra/comp_err.c +++ b/extra/comp_err.c @@ -894,7 +894,7 @@ static struct errors *generate_empty_message(uint d_code) if (!(new_error= (struct errors *) my_malloc(sizeof(*new_error), MYF(MY_WME)))) return(0); - if (my_init_dynamic_array(&new_error->msg, sizeof(struct message), 0, 1)) + if (my_init_dynamic_array(&new_error->msg, sizeof(struct message), 0, 1, MYF(0))) return(0); /* OOM: Fatal error */ new_error->er_name= NULL; @@ -928,7 +928,7 @@ static struct errors *parse_error_string(char *str, int er_count) MYF(MY_WME)))) DBUG_RETURN(0); - if (my_init_dynamic_array(&new_error->msg, sizeof(struct message), 0, 0)) + if (my_init_dynamic_array(&new_error->msg, sizeof(struct message), 0, 0, MYF(0))) DBUG_RETURN(0); /* OOM: Fatal error */ /* getting the error name */ diff --git a/extra/replace.c b/extra/replace.c index 8aef9f9a0a0..c2dcc9f50b5 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(pa->typelib.type_names); + my_free((char*) 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(pa->typelib.type_names); + my_free((char*) pa->typelib.type_names); pa->typelib.type_names=0; my_free(pa->str); } diff --git a/extra/resolve_stack_dump.c b/extra/resolve_stack_dump.c index dd77e1785d0..576710e0bde 100644 --- a/extra/resolve_stack_dump.c +++ b/extra/resolve_stack_dump.c @@ -223,7 +223,7 @@ static void init_sym_table() { char buf[512]; if (my_init_dynamic_array(&sym_table, sizeof(SYM_ENTRY), INIT_SYM_TABLE, - INC_SYM_TABLE)) + INC_SYM_TABLE, MYF(0))) die("Failed in my_init_dynamic_array() -- looks like out of memory problem"); while (fgets(buf, sizeof(buf), fp_sym)) |