diff options
| author | Marc Alff <marc.alff@sun.com> | 2009-12-11 01:58:13 -0700 |
|---|---|---|
| committer | Marc Alff <marc.alff@sun.com> | 2009-12-11 01:58:13 -0700 |
| commit | edd5ff174c063376fe8771be9d3f51fc343d9613 (patch) | |
| tree | 5d91d6cc01f82639588f2c17fbb5289637567684 /client/mysqlcheck.c | |
| parent | e33a8b2a1a254271d99b6c5f00097fd0d89adb90 (diff) | |
| parent | bd1f8f5bfaf9748ca445401687cca97a89e0dfee (diff) | |
| download | mariadb-git-edd5ff174c063376fe8771be9d3f51fc343d9613.tar.gz | |
Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc
Diffstat (limited to 'client/mysqlcheck.c')
| -rw-r--r-- | client/mysqlcheck.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/client/mysqlcheck.c b/client/mysqlcheck.c index efbb95b6657..57fa5b6a0f1 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) |