diff options
Diffstat (limited to 'client/mysqlcheck.c')
| -rw-r--r-- | client/mysqlcheck.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index e949c8059bf..a8dc25163c6 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -326,7 +326,7 @@ get_one_option(const struct my_option *opt, { char *start = argument; my_free(opt_password); - opt_password = my_strdup(argument, MYF(MY_FAE)); + opt_password = my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE)); while (*argument) *argument++= 'x'; /* Destroy argument */ if (*start) start[1] = 0; /* Cut length of argument */ @@ -567,7 +567,7 @@ static int process_selected_tables(char *db, char **table_names, int tables) tot_length+= fixed_name_length(*(table_names + i)) + 2; if (!(table_names_comma_sep = (char *) - my_malloc((sizeof(char) * tot_length) + 4, MYF(MY_WME)))) + my_malloc(PSI_NOT_INSTRUMENTED, tot_length + 4, MYF(MY_WME)))) DBUG_RETURN(1); for (end = table_names_comma_sep + 1; tables > 0; @@ -678,12 +678,12 @@ static int process_all_tables_in_db(char *database) } mysql_data_seek(res, 0); - if (!(tables=(char *) my_malloc(sizeof(char)*tot_length+4, MYF(MY_WME)))) + if (!(tables=(char *) my_malloc(PSI_NOT_INSTRUMENTED, tot_length+4, MYF(MY_WME)))) { mysql_free_result(res); DBUG_RETURN(1); } - if (!(views=(char *) my_malloc(sizeof(char)*tot_views_length+4, MYF(MY_WME)))) + if (!(views=(char *) my_malloc(PSI_NOT_INSTRUMENTED, tot_views_length+4, MYF(MY_WME)))) { my_free(tables); mysql_free_result(res); @@ -799,8 +799,7 @@ static int rebuild_table(char *name) int rc= 0; DBUG_ENTER("rebuild_table"); - query= (char*)my_malloc(sizeof(char) * (12 + strlen(name) + 6 + 1), - MYF(MY_WME)); + query= (char*)my_malloc(PSI_NOT_INSTRUMENTED, 12+strlen(name)+6+1, MYF(MY_WME)); if (!query) DBUG_RETURN(1); ptr= strxmov(query, "ALTER TABLE ", name, " FORCE", NullS); @@ -938,7 +937,7 @@ static int handle_request_for_tables(char *tables, size_t length, DBUG_RETURN(fix_table_storage_name(tables)); } - if (!(query =(char *) my_malloc(query_size, MYF(MY_WME)))) + if (!(query =(char *) my_malloc(PSI_NOT_INSTRUMENTED, query_size, MYF(MY_WME)))) DBUG_RETURN(1); if (dont_quote) { @@ -1195,14 +1194,14 @@ int main(int argc, char **argv) } if (opt_auto_repair && - (my_init_dynamic_array(&tables4repair, sizeof(char)*(NAME_LEN*2+2),16, - 64, MYF(0)) || - my_init_dynamic_array(&views4repair, sizeof(char)*(NAME_LEN*2+2),16, - 64, MYF(0)) || - my_init_dynamic_array(&tables4rebuild, sizeof(char)*(NAME_LEN*2+2),16, - 64, MYF(0)) || - my_init_dynamic_array(&alter_table_cmds, MAX_ALTER_STR_SIZE, 0, 1, - MYF(0)))) + (my_init_dynamic_array(&tables4repair, PSI_NOT_INSTRUMENTED, + NAME_LEN*2+2, 16, 64, MYF(0)) || + my_init_dynamic_array(&views4repair, PSI_NOT_INSTRUMENTED, + NAME_LEN*2+2, 16, 64, MYF(0)) || + my_init_dynamic_array(&tables4rebuild, PSI_NOT_INSTRUMENTED, + NAME_LEN*2+2, 16, 64, MYF(0)) || + my_init_dynamic_array(&alter_table_cmds, PSI_NOT_INSTRUMENTED, + MAX_ALTER_STR_SIZE, 0, 1, MYF(0)))) goto end; if (opt_alldbs) |