diff options
| author | Alexey Botchkov <holyfoot@mysql.com> | 2009-11-17 15:27:40 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@mysql.com> | 2009-11-17 15:27:40 +0400 |
| commit | 12043816fa127d4e80801bc4743f4c6bdc5b6364 (patch) | |
| tree | 6b7a74d4ca5d8a84274ea7033d217f86ce4737a8 /client/mysqladmin.cc | |
| parent | f4000a67e92ea4f2501f51aa3d51afed0a7d9bfa (diff) | |
| parent | de7619823d3846fa514d7f540a7e5af898b142a8 (diff) | |
| download | mariadb-git-12043816fa127d4e80801bc4743f4c6bdc5b6364.tar.gz | |
merging.
Diffstat (limited to 'client/mysqladmin.cc')
| -rw-r--r-- | client/mysqladmin.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqladmin.cc b/client/mysqladmin.cc index a3eee14e0d1..c8cbafe72d9 100644 --- a/client/mysqladmin.cc +++ b/client/mysqladmin.cc @@ -304,7 +304,8 @@ int main(int argc,char *argv[]) MY_INIT(argv[0]); mysql_init(&mysql); - load_defaults("my",load_default_groups,&argc,&argv); + if (load_defaults("my",load_default_groups,&argc,&argv)) + exit(1); save_argv = argv; /* Save for free_defaults */ if ((ho_error=handle_options(&argc, &argv, my_long_options, get_one_option))) { |