diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-09-29 14:48:11 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-10-14 10:29:30 +0200 |
| commit | 927521a2c18954f03869e91281b90af79b719166 (patch) | |
| tree | c7c0fed839777e15645dccf930fc06841445680c /sql | |
| parent | f7b8d1449046a9f36618435c972d7ca8b961b540 (diff) | |
| download | mariadb-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 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
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; |