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/mysqlimport.c | |
parent | f4000a67e92ea4f2501f51aa3d51afed0a7d9bfa (diff) | |
parent | de7619823d3846fa514d7f540a7e5af898b142a8 (diff) | |
download | mariadb-git-12043816fa127d4e80801bc4743f4c6bdc5b6364.tar.gz |
merging.
Diffstat (limited to 'client/mysqlimport.c')
-rw-r--r-- | client/mysqlimport.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 5b8ec95c06d..867663db8be 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -592,7 +592,8 @@ int main(int argc, char **argv) char **argv_to_free; MY_INIT(argv[0]); - load_defaults("my",load_default_groups,&argc,&argv); + if (load_defaults("my",load_default_groups,&argc,&argv)) + return 1; /* argv is changed in the program */ argv_to_free= argv; if (get_options(&argc, &argv)) |