summaryrefslogtreecommitdiff
path: root/storage/myisam/myisamchk.c
diff options
context:
space:
mode:
authorKonstantin Osipov <kostja@sun.com>2009-12-15 22:59:07 +0300
committerKonstantin Osipov <kostja@sun.com>2009-12-15 22:59:07 +0300
commit391b5246fef4110bc73227c67f77eec5611a612e (patch)
tree43a14c6ad76010ee31038173e53da44517c84dbe /storage/myisam/myisamchk.c
parent92b1c2f3caafe6529a08992d7f134476c7b9ff70 (diff)
parent27fca0ab1775a8c1dfe699c978b6448a7aa8f47b (diff)
downloadmariadb-git-391b5246fef4110bc73227c67f77eec5611a612e.tar.gz
Merge next-mr -> next-4284.
Diffstat (limited to 'storage/myisam/myisamchk.c')
-rw-r--r--storage/myisam/myisamchk.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/myisam/myisamchk.c b/storage/myisam/myisamchk.c
index b53a1009ba2..e4eccdc1dc6 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;