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 | bea4ab9bb65f6ff576b9b71011c5a8f22baa164a (patch) | |
tree | 5d91d6cc01f82639588f2c17fbb5289637567684 /client/mysqldump.c | |
parent | c082955f0676efe069f30384102ba7807b49dee6 (diff) | |
parent | 376cf4275f28f6b8167eaf19b2c66dee41fbc5c5 (diff) | |
download | mariadb-git-bea4ab9bb65f6ff576b9b71011c5a8f22baa164a.tar.gz |
Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marc
Diffstat (limited to 'client/mysqldump.c')
-rw-r--r-- | client/mysqldump.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqldump.c b/client/mysqldump.c index f9a64e4c9d2..9c665e6d76a 100644 --- a/client/mysqldump.c +++ b/client/mysqldump.c @@ -890,7 +890,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, |