diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/completion_hash.cc | 2 | ||||
| -rw-r--r-- | client/mysql.cc | 2 | ||||
| -rw-r--r-- | client/mysqlbinlog.cc | 4 | ||||
| -rw-r--r-- | client/mysqlcheck.c | 4 | ||||
| -rw-r--r-- | client/mysqldump.c | 2 | ||||
| -rw-r--r-- | client/mysqltest.cc | 8 |
6 files changed, 11 insertions, 11 deletions
diff --git a/client/completion_hash.cc b/client/completion_hash.cc index 1a8bc4d5035..c170b69de2d 100644 --- a/client/completion_hash.cc +++ b/client/completion_hash.cc @@ -49,7 +49,7 @@ int completion_hash_init(HashTable *ht, uint nSize) ht->initialized = 0; return FAILURE; } - init_alloc_root(&ht->mem_root, 8192, 0, 0); + init_alloc_root(&ht->mem_root, 8192, 0, MYF(0)); ht->pHashFunction = hashpjw; ht->nTableSize = nSize; ht->initialized = 1; diff --git a/client/mysql.cc b/client/mysql.cc index c4cfcc4f1ff..38054668411 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -1157,7 +1157,7 @@ int main(int argc,char *argv[]) } glob_buffer.realloc(512); completion_hash_init(&ht, 128); - init_alloc_root(&hash_mem_root, 16384, 0, 0); + init_alloc_root(&hash_mem_root, 16384, 0, MYF(0)); bzero((char*) &mysql, sizeof(mysql)); if (sql_connect(current_host,current_db,current_user,opt_password, opt_silent)) diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index 95e2066cf41..87198347b10 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -279,7 +279,7 @@ public: int init() { return my_init_dynamic_array(&file_names, sizeof(File_name_record), - 100, 100, 0); + 100, 100, MYF(0)); } void init_by_dir_name(const char *dir) @@ -2393,7 +2393,7 @@ int main(int argc, char** argv) my_init_time(); // for time functions - init_alloc_root(&s_mem_root, 16384, 0, 0); + init_alloc_root(&s_mem_root, 16384, 0, MYF(0)); if (load_defaults("my", load_groups, &argc, &argv)) exit(1); diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index eb2bed9d13f..8d1122dc0fd 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -995,9 +995,9 @@ int main(int argc, char **argv) if (opt_auto_repair && (my_init_dynamic_array(&tables4repair, sizeof(char)*(NAME_LEN*2+2),16, - 64, 0) || + 64, MYF(0)) || my_init_dynamic_array(&tables4rebuild, sizeof(char)*(NAME_LEN*2+2),16, - 64, 0))) + 64, MYF(0)))) goto end; if (opt_alldbs) diff --git a/client/mysqldump.c b/client/mysqldump.c index 583524a43d8..2b94e65aa0b 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -4583,7 +4583,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables) if (init_dumping(db, init_dumping_tables)) DBUG_RETURN(1); - init_alloc_root(&root, 8192, 0, 0); + init_alloc_root(&root, 8192, 0, MYF(0)); if (!(dump_tables= pos= (char**) alloc_root(&root, tables * sizeof(char *)))) die(EX_EOM, "alloc_root failure."); diff --git a/client/mysqltest.cc b/client/mysqltest.cc index a60c8da93bf..9082beed884 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -8899,7 +8899,7 @@ int main(int argc, char **argv) cur_block->ok= TRUE; /* Outer block should always be executed */ cur_block->cmd= cmd_none; - my_init_dynamic_array(&q_lines, sizeof(struct st_command*), 1024, 1024, 0); + my_init_dynamic_array(&q_lines, sizeof(struct st_command*), 1024, 1024, MYF(0)); if (my_hash_init2(&var_hash, 64, charset_info, 128, 0, 0, get_var_key, var_free, MYF(0))) @@ -8929,7 +8929,7 @@ int main(int argc, char **argv) #endif init_dynamic_string(&ds_res, "", 2048, 2048); - init_alloc_root(&require_file_root, 1024, 1024, 0); + init_alloc_root(&require_file_root, 1024, 1024, MYF(0)); parse_args(argc, argv); @@ -9873,7 +9873,7 @@ struct st_replace_regex* init_replace_regex(char* expr) /* my_malloc() will die on fail with MY_FAE */ res=(struct st_replace_regex*)my_malloc( sizeof(*res)+expr_len ,MYF(MY_FAE+MY_WME)); - my_init_dynamic_array(&res->regex_arr,sizeof(struct st_regex), 128, 128, 0); + my_init_dynamic_array(&res->regex_arr,sizeof(struct st_regex), 128, 128, MYF(0)); buf= (char*)res + sizeof(*res); expr_end= expr + expr_len; @@ -10928,7 +10928,7 @@ void dynstr_append_sorted(DYNAMIC_STRING* ds, DYNAMIC_STRING *ds_input, if (!*start) DBUG_VOID_RETURN; /* No input */ - my_init_dynamic_array(&lines, sizeof(const char*), 32, 32, 0); + my_init_dynamic_array(&lines, sizeof(const char*), 32, 32, MYF(0)); if (keep_header) { |