diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-03-28 17:06:27 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-28 17:31:57 +0200 |
| commit | b1818dccf772e0fd495502c6dfc1600853e007d0 (patch) | |
| tree | d9c441c38681d634d50cf36021a3bf439b2e44ca /client/mysqlcheck.c | |
| parent | c34602995894c9a04f4312484cfe6e45c43426e6 (diff) | |
| parent | aafb9d44d65e42df72af28c940e5b23b4bc3bd43 (diff) | |
| download | mariadb-git-b1818dccf772e0fd495502c6dfc1600853e007d0.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'client/mysqlcheck.c')
| -rw-r--r-- | client/mysqlcheck.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index 0854c890824..5e366c5e3d1 100644 --- a/client/mysqlcheck.c +++ b/client/mysqlcheck.c @@ -1181,9 +1181,7 @@ int main(int argc, char **argv) /* ** Check out the args */ - if (load_defaults("my", load_default_groups, &argc, &argv)) - goto end2; - + load_defaults_or_exit("my", load_default_groups, &argc, &argv); defaults_argv= argv; if (get_options(&argc, &argv)) goto end1; @@ -1259,7 +1257,6 @@ int main(int argc, char **argv) my_free(shared_memory_base_name); mysql_library_end(); free_defaults(defaults_argv); - end2: my_end(my_end_arg); return ret; } /* main */ |