summaryrefslogtreecommitdiff
path: root/client/mysqlcheck.c
diff options
context:
space:
mode:
authorAlexey Botchkov <holyfoot@mysql.com>2009-11-17 15:27:40 +0400
committerAlexey Botchkov <holyfoot@mysql.com>2009-11-17 15:27:40 +0400
commit6c832ee4bf4b0bc0bca769dcff10a994e202263b (patch)
tree6b7a74d4ca5d8a84274ea7033d217f86ce4737a8 /client/mysqlcheck.c
parent5b8a24cf04b4aa76b301036f58fb624a4ff361e0 (diff)
parent760d42e7d00a387dec00590cef1775e9e3132438 (diff)
downloadmariadb-git-6c832ee4bf4b0bc0bca769dcff10a994e202263b.tar.gz
merging.
Diffstat (limited to 'client/mysqlcheck.c')
-rw-r--r--client/mysqlcheck.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c
index 1affea1d189..252ee500cf6 100644
--- a/client/mysqlcheck.c
+++ b/client/mysqlcheck.c
@@ -344,9 +344,8 @@ static int get_options(int *argc, char ***argv)
exit(0);
}
- load_defaults("my", load_default_groups, argc, argv);
-
- if ((ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
+ if ((ho_error= load_defaults("my", load_default_groups, argc, argv)) ||
+ (ho_error=handle_options(argc, argv, my_long_options, get_one_option)))
exit(ho_error);
if (!what_to_do)