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 /storage/myisam | |
| 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 'storage/myisam')
| -rw-r--r-- | storage/myisam/myisamchk.c | 4 | ||||
| -rw-r--r-- | storage/myisam/myisampack.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index edbe235e190..dfff5720847 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -753,9 +753,7 @@ static void get_options(register int *argc,register char ***argv) { int ho_error; - if (load_defaults("my", load_default_groups, argc, argv)) - exit(1); - + load_defaults_or_exit("my", load_default_groups, argc, argv); default_argv= *argv; if (isatty(fileno(stdout))) check_param.testflag|=T_WRITE_LOOP; diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c index 966edc877cd..bb9f59f86f7 100644 --- a/storage/myisam/myisampack.c +++ b/storage/myisam/myisampack.c @@ -209,9 +209,7 @@ int main(int argc, char **argv) char **default_argv; MY_INIT(argv[0]); - if (load_defaults("my",load_default_groups,&argc,&argv)) - exit(1); - + load_defaults_or_exit("my", load_default_groups, &argc, &argv); default_argv= argv; get_options(&argc,&argv); |