diff options
| -rw-r--r-- | extra/my_print_defaults.c | 3 | ||||
| -rw-r--r-- | include/my_default.h | 1 | ||||
| -rw-r--r-- | mysys/my_default.c | 4 | ||||
| -rw-r--r-- | mysys/my_getopt.c | 1 | ||||
| -rw-r--r-- | sql-common/client.c | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 1 |
6 files changed, 4 insertions, 8 deletions
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index 9fa4a1d4faf..20daa530dbb 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -198,8 +198,7 @@ int main(int argc, char **argv) } for (argument= arguments+1 ; *argument ; argument++) - if (!my_getopt_is_args_separator(*argument)) /* skip arguments separator */ - puts(*argument); + puts(*argument); my_free(load_default_groups); free_defaults(arguments); my_end(0); diff --git a/include/my_default.h b/include/my_default.h index 438ef3352bc..71de52a40fc 100644 --- a/include/my_default.h +++ b/include/my_default.h @@ -24,7 +24,6 @@ extern const char *my_defaults_extra_file; extern const char *my_defaults_group_suffix; extern const char *my_defaults_file; extern my_bool my_getopt_use_args_separator; -extern my_bool my_getopt_is_args_separator(const char* arg); extern int get_defaults_options(char **argv); extern int my_load_defaults(const char *conf_file, const char **groups, diff --git a/mysys/my_default.c b/mysys/my_default.c index f60a56704b5..b27ae9670a8 100644 --- a/mysys/my_default.c +++ b/mysys/my_default.c @@ -335,6 +335,7 @@ int get_defaults_options(char **argv) if (*argv && !strcmp(*argv, "--print-defaults")) { my_print_defaults= 1; + my_getopt_use_args_separator= FALSE; argv++; } @@ -499,8 +500,7 @@ int my_load_defaults(const char *conf_file, const char **groups, int *argc, printf("%s would have been started with the following arguments:\n", **argv); for (i=1 ; i < *argc ; i++) - if (!my_getopt_is_args_separator((*argv)[i])) /* skip arguments separator */ - printf("%s ", (*argv)[i]); + printf("%s ", (*argv)[i]); puts(""); DBUG_RETURN(4); } diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c index 1db87b2c6bc..fa870405f70 100644 --- a/mysys/my_getopt.c +++ b/mysys/my_getopt.c @@ -24,6 +24,7 @@ #include <my_getopt.h> #include <errno.h> +my_bool my_getopt_is_args_separator(const char* arg); typedef void (*init_func_p)(const struct my_option *option, void *variable, longlong value); diff --git a/sql-common/client.c b/sql-common/client.c index 0546188f4d5..e0734b7dc18 100644 --- a/sql-common/client.c +++ b/sql-common/client.c @@ -854,8 +854,6 @@ void mysql_read_default_options(struct st_mysql_options *options, char **option=argv; while (*++option) { - if (my_getopt_is_args_separator(option[0])) /* skip arguments separator */ - continue; /* DBUG_PRINT("info",("option: %s",option[0])); */ if (option[0][0] == '-' && option[0][1] == '-') { diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 603bb6296bc..bea31975866 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5350,7 +5350,6 @@ int mysqld_main(int argc, char **argv) orig_argv= argv; my_getopt_use_args_separator= TRUE; load_defaults_or_exit(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv); - my_getopt_use_args_separator= FALSE; defaults_argc= argc; defaults_argv= argv; remaining_argc= argc; |