summaryrefslogtreecommitdiff
path: root/mysys/my_default.c
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-01-17 10:37:11 +0100
committerSergei Golubchik <serg@mariadb.org>2020-01-17 17:19:23 +0100
commit744d545fd77b5d822b0d27d1d192ff7511307be3 (patch)
tree06ba4a1c1d92d19db2db1bbc043c1fea4ff7ba97 /mysys/my_default.c
parent8bcbdaf730a6a25b6b7117a57f8b052aadb6407a (diff)
downloadmariadb-git-744d545fd77b5d822b0d27d1d192ff7511307be3.tar.gz
restore support for --defaults-file=<(...)
if my_realpath() fails, don't return the error code, get_defaults_options() returns a number of options consumed, not 0=ok/1=error. instead, ignore the error from my_realpath. If it fails it internally falls back to my_load_path, which restores 10.4- behavior
Diffstat (limited to 'mysys/my_default.c')
-rw-r--r--mysys/my_default.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/mysys/my_default.c b/mysys/my_default.c
index 3ef960b8ce7..30c76c7f5ed 100644
--- a/mysys/my_default.c
+++ b/mysys/my_default.c
@@ -322,17 +322,13 @@ int get_defaults_options(char **argv)
if (my_defaults_extra_file && my_defaults_extra_file != extra_file_buffer)
{
- int error= my_realpath(extra_file_buffer, my_defaults_extra_file, MYF(0));
- if (error)
- return error;
+ my_realpath(extra_file_buffer, my_defaults_extra_file, MYF(0));
my_defaults_extra_file= extra_file_buffer;
}
if (my_defaults_file && my_defaults_file != file_buffer)
{
- int error= my_realpath(file_buffer, my_defaults_file, MYF(0));
- if (error)
- return error;
+ my_realpath(file_buffer, my_defaults_file, MYF(0));
my_defaults_file= file_buffer;
}