summaryrefslogtreecommitdiff
path: root/client/mysql.cc
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2018-03-15 15:34:45 +0400
committerSergey Vojtovich <svoj@mariadb.org>2018-03-16 13:26:52 +0400
commit0a534348c75cf435d2017959855de2efa798fd0b (patch)
tree48c7ee2f194ccf375877e4be7014c56e6adf8601 /client/mysql.cc
parent7033af9e81a69d75199faa028f8959667f755551 (diff)
downloadmariadb-git-0a534348c75cf435d2017959855de2efa798fd0b.tar.gz
MDEV-14265 - RPMLint warning: shared-lib-calls-exit
Eliminated last exit() call from libmysqld.
Diffstat (limited to 'client/mysql.cc')
-rw-r--r--client/mysql.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 7973c3c7fc3..0b8be00c542 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -1175,11 +1175,7 @@ int main(int argc,char *argv[])
close(stdout_fileno_copy); /* Clean up dup(). */
}
- if (load_defaults("my",load_default_groups,&argc,&argv))
- {
- my_end(0);
- exit(1);
- }
+ load_defaults_or_exit("my", load_default_groups, &argc, &argv);
defaults_argv=argv;
if ((status.exit_status= get_options(argc, (char **) argv)))
mysql_end(-1);