summaryrefslogtreecommitdiff
path: root/sql/mysqld.cc
diff options
context:
space:
mode:
Diffstat (limited to 'sql/mysqld.cc')
-rw-r--r--sql/mysqld.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 3cb8e41f94e..4f57d6d1910 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -5511,8 +5511,7 @@ int mysqld_main(int argc, char **argv)
orig_argc= argc;
orig_argv= argv;
my_getopt_use_args_separator= TRUE;
- if (load_defaults(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv))
- return 1;
+ load_defaults_or_exit(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv);
my_getopt_use_args_separator= FALSE;
defaults_argc= argc;
defaults_argv= argv;