summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2019-09-29 14:48:11 +0200
committerSergei Golubchik <serg@mariadb.org>2019-10-14 10:29:30 +0200
commit927521a2c18954f03869e91281b90af79b719166 (patch)
treec7c0fed839777e15645dccf930fc06841445680c /include
parentf7b8d1449046a9f36618435c972d7ca8b961b540 (diff)
downloadmariadb-git-927521a2c18954f03869e91281b90af79b719166.tar.gz
MDEV-12684 Show what config file a sysvar got a value from
make load_defaults() store the file name in the generated option list using a special marker ---file-marker--- option. Pick up this filename in handle_options(). Remove ---args-separator---, use ---file-marker--- with an empty file name instead - this simplifies checks on the caller, only one special option to recognize.
Diffstat (limited to 'include')
-rw-r--r--include/my_default.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_default.h b/include/my_default.h
index 71de52a40fc..541dd10b3ab 100644
--- a/include/my_default.h
+++ b/include/my_default.h
@@ -23,7 +23,7 @@ C_MODE_START
extern const char *my_defaults_extra_file;
extern const char *my_defaults_group_suffix;
extern const char *my_defaults_file;
-extern my_bool my_getopt_use_args_separator;
+extern my_bool my_defaults_mark_files;
extern int get_defaults_options(char **argv);
extern int my_load_defaults(const char *conf_file, const char **groups,