diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2018-03-15 15:34:45 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-03-16 13:26:52 +0400 |
| commit | 0a534348c75cf435d2017959855de2efa798fd0b (patch) | |
| tree | 48c7ee2f194ccf375877e4be7014c56e6adf8601 /extra/my_print_defaults.c | |
| parent | 7033af9e81a69d75199faa028f8959667f755551 (diff) | |
| download | mariadb-git-0a534348c75cf435d2017959855de2efa798fd0b.tar.gz | |
MDEV-14265 - RPMLint warning: shared-lib-calls-exit
Eliminated last exit() call from libmysqld.
Diffstat (limited to 'extra/my_print_defaults.c')
| -rw-r--r-- | extra/my_print_defaults.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/my_print_defaults.c b/extra/my_print_defaults.c index 78940e02ca4..07c95a79ddc 100644 --- a/extra/my_print_defaults.c +++ b/extra/my_print_defaults.c @@ -206,6 +206,9 @@ int main(int argc, char **argv) if ((error= load_defaults(config_file, (const char **) load_default_groups, &count, &arguments))) { + my_end(0); + if (error == 4) + return 0; if (verbose && opt_defaults_file_used) { if (error == 1) @@ -216,8 +219,7 @@ int main(int argc, char **argv) fprintf(stderr, "WARNING: Defaults file '%s' is not a regular file!\n", config_file); } - error= 2; - exit(error); + return 2; } for (argument= arguments+1 ; *argument ; argument++) |