summaryrefslogtreecommitdiff
path: root/client/mysqldump.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/mysqldump.c
parent5b8a24cf04b4aa76b301036f58fb624a4ff361e0 (diff)
parent760d42e7d00a387dec00590cef1775e9e3132438 (diff)
downloadmariadb-git-6c832ee4bf4b0bc0bca769dcff10a994e202263b.tar.gz
merging.
Diffstat (limited to 'client/mysqldump.c')
-rw-r--r--client/mysqldump.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c
index aa81a0e98bf..54e7d68e191 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -858,7 +858,8 @@ static int get_options(int *argc, char ***argv)
opt_net_buffer_length= *mysql_params->p_net_buffer_length;
md_result_file= stdout;
- load_defaults("my",load_default_groups,argc,argv);
+ if (load_defaults("my",load_default_groups,argc,argv))
+ return 1;
defaults_argv= *argv;
if (my_hash_init(&ignore_table, charset_info, 16, 0, 0,