From 927521a2c18954f03869e91281b90af79b719166 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 29 Sep 2019 14:48:11 +0200 Subject: 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. --- sql/mysqld.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sql') diff --git a/sql/mysqld.cc b/sql/mysqld.cc index bea31975866..4fc24c3a7d5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -5348,7 +5348,7 @@ int mysqld_main(int argc, char **argv) orig_argc= argc; orig_argv= argv; - my_getopt_use_args_separator= TRUE; + my_defaults_mark_files= TRUE; load_defaults_or_exit(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv); defaults_argc= argc; defaults_argv= argv; -- cgit v1.2.1