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/mysqlslap.c | |
| parent | c34602995894c9a04f4312484cfe6e45c43426e6 (diff) | |
| parent | aafb9d44d65e42df72af28c940e5b23b4bc3bd43 (diff) | |
| download | mariadb-git-b1818dccf772e0fd495502c6dfc1600853e007d0.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'client/mysqlslap.c')
| -rw-r--r-- | client/mysqlslap.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 83c5838f739..420dc2b94af 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -325,11 +325,7 @@ int main(int argc, char **argv) MY_INIT(argv[0]); sf_leaking_memory=1; /* don't report memory leaks on early exits */ - 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 (get_options(&argc,&argv)) { |