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 | 6c832ee4bf4b0bc0bca769dcff10a994e202263b (patch) | |
| tree | 6b7a74d4ca5d8a84274ea7033d217f86ce4737a8 /client/mysqlimport.c | |
| parent | 5b8a24cf04b4aa76b301036f58fb624a4ff361e0 (diff) | |
| parent | 760d42e7d00a387dec00590cef1775e9e3132438 (diff) | |
| download | mariadb-git-6c832ee4bf4b0bc0bca769dcff10a994e202263b.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)) |