summaryrefslogtreecommitdiff
path: root/mysys/default.c
diff options
context:
space:
mode:
authorunknown <ramil@mysql.com>2005-05-12 17:23:16 +0500
committerunknown <ramil@mysql.com>2005-05-12 17:23:16 +0500
commit7b36ac4819a02c25664a5f70f74262c3720eccab (patch)
tree850f26fb915dfedcf39bc1dc0af0da587981b048 /mysys/default.c
parent362a340de34628ad38837a57ab85242540147de4 (diff)
downloadmariadb-git-7b36ac4819a02c25664a5f70f74262c3720eccab.tar.gz
--default-extra-file handling code fix.
mysys/default.c: if we check for error, we should set it.
Diffstat (limited to 'mysys/default.c')
-rw-r--r--mysys/default.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/default.c b/mysys/default.c
index 5afefa5463d..d35eb399b80 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -152,8 +152,8 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv,
}
else if (defaults_extra_file)
{
- if (search_default_file_with_ext(func, func_ctx, "", "",
- defaults_extra_file, 0) < 0)
+ if ((error= search_default_file_with_ext(func, func_ctx, "", "",
+ defaults_extra_file, 0)) < 0)
goto err; /* Fatal error */
if (error > 0)
{