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
commit6c832ee4bf4b0bc0bca769dcff10a994e202263b (patch)
tree6b7a74d4ca5d8a84274ea7033d217f86ce4737a8 /storage/archive
parent5b8a24cf04b4aa76b301036f58fb624a4ff361e0 (diff)
parent760d42e7d00a387dec00590cef1775e9e3132438 (diff)
downloadmariadb-git-6c832ee4bf4b0bc0bca769dcff10a994e202263b.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);