summaryrefslogtreecommitdiff
path: root/storage/archive
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
commit12043816fa127d4e80801bc4743f4c6bdc5b6364 (patch)
tree6b7a74d4ca5d8a84274ea7033d217f86ce4737a8 /storage/archive
parentf4000a67e92ea4f2501f51aa3d51afed0a7d9bfa (diff)
parentde7619823d3846fa514d7f540a7e5af898b142a8 (diff)
downloadmariadb-git-12043816fa127d4e80801bc4743f4c6bdc5b6364.tar.gz
merging.
Diffstat (limited to 'storage/archive')
-rw-r--r--storage/archive/archive_reader.c3
1 files changed, 2 insertions, 1 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);