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 /storage | |
| parent | f4000a67e92ea4f2501f51aa3d51afed0a7d9bfa (diff) | |
| parent | de7619823d3846fa514d7f540a7e5af898b142a8 (diff) | |
| download | mariadb-git-12043816fa127d4e80801bc4743f4c6bdc5b6364.tar.gz | |
merging.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/archive/archive_reader.c | 3 | ||||
| -rw-r--r-- | storage/myisam/myisamchk.c | 4 | ||||
| -rw-r--r-- | storage/myisam/myisampack.c | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/storage/archive/archive_reader.c b/storage/archive/archive_reader.c index 84d4e318b49..0d641de3e15 100644 --- a/storage/archive/archive_reader.c +++ b/storage/archive/archive_reader.c @@ -390,7 +390,8 @@ static void print_version(void) static void get_options(int *argc, char ***argv) { - load_defaults("my", load_default_groups, argc, argv); + if (load_defaults("my", load_default_groups, argc, argv)) + exit(1); default_argv= *argv; handle_options(argc, argv, my_long_options, get_one_option); diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c index 611fb6325c8..de0e53e6a36 100644 --- a/storage/myisam/myisamchk.c +++ b/storage/myisam/myisamchk.c @@ -740,7 +740,9 @@ static void get_options(register int *argc,register char ***argv) { int ho_error; - load_defaults("my", load_default_groups, argc, argv); + if (load_defaults("my", load_default_groups, argc, argv)) + exit(1); + default_argv= *argv; if (isatty(fileno(stdout))) check_param.testflag|=T_WRITE_LOOP; diff --git a/storage/myisam/myisampack.c b/storage/myisam/myisampack.c index 908c32e48d3..9ebd11b2516 100644 --- a/storage/myisam/myisampack.c +++ b/storage/myisam/myisampack.c @@ -208,7 +208,9 @@ int main(int argc, char **argv) char **default_argv; MY_INIT(argv[0]); - load_defaults("my",load_default_groups,&argc,&argv); + if (load_defaults("my",load_default_groups,&argc,&argv)) + exit(1); + default_argv= argv; get_options(&argc,&argv); |