diff options
Diffstat (limited to 'client/mysql_plugin.c')
| -rw-r--r-- | client/mysql_plugin.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/client/mysql_plugin.c b/client/mysql_plugin.c index f496db4e72b..a00f5e4450b 100644 --- a/client/mysql_plugin.c +++ b/client/mysql_plugin.c @@ -193,7 +193,7 @@ static char *get_value(char *line, const char *item) char *s= 0; s = line + item_len + 1; - destination= my_strndup(s, line_len - start, MYF(MY_FAE)); + destination= my_strndup(PSI_NOT_INSTRUMENTED, s, line_len - start, MYF(MY_FAE)); destination[line_len - item_len - 2]= 0; } return destination; @@ -261,7 +261,7 @@ static int has_spaces(const char *path) static char *convert_path(const char *argument) { /* Convert / to \\ to make Windows paths */ - char *winfilename= my_strdup(argument, MYF(MY_FAE)); + char *winfilename= my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE)); char *pos, *end; size_t length= strlen(argument); @@ -293,7 +293,7 @@ static char *add_quotes(const char *path) else snprintf(windows_cmd_friendly, sizeof(windows_cmd_friendly), "%s", path); - return my_strdup(windows_cmd_friendly, MYF(MY_FAE)); + return my_strdup(PSI_NOT_INSTRUMENTED, windows_cmd_friendly, MYF(MY_FAE)); } #endif @@ -379,16 +379,16 @@ static int get_default_values() if ((opt_datadir == 0) && ((value= get_value(line, "--datadir")))) { - opt_datadir= my_strdup(value, MYF(MY_FAE)); + opt_datadir= my_strdup(PSI_NOT_INSTRUMENTED, value, MYF(MY_FAE)); } if ((opt_basedir == 0) && ((value= get_value(line, "--basedir")))) { - opt_basedir= my_strdup(value, MYF(MY_FAE)); + opt_basedir= my_strdup(PSI_NOT_INSTRUMENTED, value, MYF(MY_FAE)); } if ((opt_plugin_dir == 0) && ((value= get_value(line, "--plugin_dir")) || (value= get_value(line, "--plugin-dir")))) { - opt_plugin_dir= my_strdup(value, MYF(MY_FAE)); + opt_plugin_dir= my_strdup(PSI_NOT_INSTRUMENTED, value, MYF(MY_FAE)); } if ((opt_lc_messages_dir == 0) && ((value= get_value(line, "--lc_messages_dir")) || @@ -396,7 +396,7 @@ static int get_default_values() (value= get_value(line, "--lc-messages_dir")) || (value= get_value(line, "--lc-messages-dir")))) { - opt_lc_messages_dir= my_strdup(value, MYF(MY_FAE)); + opt_lc_messages_dir= my_strdup(PSI_NOT_INSTRUMENTED, value, MYF(MY_FAE)); } } @@ -488,11 +488,11 @@ static void print_default_values(void) */ static my_bool -get_one_option(int optid, - const struct my_option *opt __attribute__((unused)), - char *argument) +get_one_option(const struct my_option *opt, + const char *argument, + const char *filename __attribute__((unused))) { - switch(optid) { + switch(opt->id) { case 'n': opt_no_defaults++; break; @@ -512,25 +512,25 @@ get_one_option(int optid, usage(); exit(0); case 'd': - opt_datadir= my_strdup(argument, MYF(MY_FAE)); + opt_datadir= my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE)); break; case 'b': - opt_basedir= my_strdup(argument, MYF(MY_FAE)); + opt_basedir= my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE)); break; case 'p': - opt_plugin_dir= my_strdup(argument, MYF(MY_FAE)); + opt_plugin_dir= my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE)); break; case 'i': - opt_plugin_ini= my_strdup(argument, MYF(MY_FAE)); + opt_plugin_ini= my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE)); break; case 'm': - opt_mysqld= my_strdup(argument, MYF(MY_FAE)); + opt_mysqld= my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE)); break; case 'f': - opt_my_print_defaults= my_strdup(argument, MYF(MY_FAE)); + opt_my_print_defaults= my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE)); break; case 'l': - opt_lc_messages_dir= my_strdup(argument, MYF(MY_FAE)); + opt_lc_messages_dir= my_strdup(PSI_NOT_INSTRUMENTED, argument, MYF(MY_FAE)); break; } @@ -639,7 +639,7 @@ static int load_plugin_data(char *plugin_name, char *config_file) if (opt_plugin_ini == 0) { fn_format(path, config_file, opt_plugin_dir, "", MYF(0)); - opt_plugin_ini= my_strdup(path, MYF(MY_FAE)); + opt_plugin_ini= my_strdup(PSI_NOT_INSTRUMENTED, path, MYF(MY_FAE)); } if (!file_exists(opt_plugin_ini)) { @@ -655,7 +655,7 @@ static int load_plugin_data(char *plugin_name, char *config_file) } /* save name */ - plugin_data.name= my_strdup(plugin_name, MYF(MY_WME)); + plugin_data.name= my_strdup(PSI_NOT_INSTRUMENTED, plugin_name, MYF(MY_WME)); /* Read plugin components */ while (i < 16) @@ -685,14 +685,14 @@ static int load_plugin_data(char *plugin_name, char *config_file) /* Add proper file extension for soname */ strcat(line, FN_SOEXT); /* save so_name */ - plugin_data.so_name= my_strdup(line, MYF(MY_WME|MY_ZEROFILL)); + plugin_data.so_name= my_strdup(PSI_NOT_INSTRUMENTED, line, MYF(MY_WME|MY_ZEROFILL)); i++; } else { if (strlen(line) > 0) { - plugin_data.components[i]= my_strdup(line, MYF(MY_WME)); + plugin_data.components[i]= my_strdup(PSI_NOT_INSTRUMENTED, line, MYF(MY_WME)); i++; } else @@ -758,21 +758,21 @@ static int check_options(int argc, char **argv, char *operation) else if ((strncasecmp(argv[i], basedir_prefix, basedir_len) == 0) && !opt_basedir) { - opt_basedir= my_strndup(argv[i]+basedir_len, + opt_basedir= my_strndup(PSI_NOT_INSTRUMENTED, argv[i]+basedir_len, strlen(argv[i])-basedir_len, MYF(MY_FAE)); num_found++; } else if ((strncasecmp(argv[i], datadir_prefix, datadir_len) == 0) && !opt_datadir) { - opt_datadir= my_strndup(argv[i]+datadir_len, + opt_datadir= my_strndup(PSI_NOT_INSTRUMENTED, argv[i]+datadir_len, strlen(argv[i])-datadir_len, MYF(MY_FAE)); num_found++; } else if ((strncasecmp(argv[i], plugin_dir_prefix, plugin_dir_len) == 0) && !opt_plugin_dir) { - opt_plugin_dir= my_strndup(argv[i]+plugin_dir_len, + opt_plugin_dir= my_strndup(PSI_NOT_INSTRUMENTED, argv[i]+plugin_dir_len, strlen(argv[i])-plugin_dir_len, MYF(MY_FAE)); num_found++; } @@ -885,7 +885,7 @@ static int process_options(int argc, char *argv[], char *operation) #endif buff[sizeof(buff) - 1]= 0; my_free(opt_basedir); - opt_basedir= my_strdup(buff, MYF(MY_FAE)); + opt_basedir= my_strdup(PSI_NOT_INSTRUMENTED, buff, MYF(MY_FAE)); } } |