From 0a534348c75cf435d2017959855de2efa798fd0b Mon Sep 17 00:00:00 2001 From: Sergey Vojtovich Date: Thu, 15 Mar 2018 15:34:45 +0400 Subject: MDEV-14265 - RPMLint warning: shared-lib-calls-exit Eliminated last exit() call from libmysqld. --- client/mysql_upgrade.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'client/mysql_upgrade.c') diff --git a/client/mysql_upgrade.c b/client/mysql_upgrade.c index cbdd398c1e1..5eb495774ce 100644 --- a/client/mysql_upgrade.c +++ b/client/mysql_upgrade.c @@ -1133,6 +1133,8 @@ int main(int argc, char **argv) char self_name[FN_REFLEN + 1]; MY_INIT(argv[0]); + load_defaults_or_exit("my", load_default_groups, &argc, &argv); + defaults_argv= argv; /* Must be freed by 'free_defaults' */ #if __WIN__ if (GetModuleFileName(NULL, self_name, FN_REFLEN) == 0) @@ -1145,10 +1147,6 @@ int main(int argc, char **argv) init_dynamic_string(&conn_args, "", 512, 256)) die("Out of memory"); - if (load_defaults("my", load_default_groups, &argc, &argv)) - die(NULL); - defaults_argv= argv; /* Must be freed by 'free_defaults' */ - if (handle_options(&argc, &argv, my_long_options, get_one_option)) die(NULL); if (debug_info_flag) -- cgit v1.2.1