diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2017-09-08 16:47:44 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2017-09-08 16:48:15 +0200 |
| commit | d52edb75bbe392fc24f317dabbe4e69245ae993d (patch) | |
| tree | 93d9cee0964809070b6e219018db4cc16958f90e | |
| parent | 43632f4cd5f3fc7aaa9a0aa757081725f120c488 (diff) | |
| download | mariadb-git-d52edb75bbe392fc24f317dabbe4e69245ae993d.tar.gz | |
Bug#23072792 MYSQL_GROUP_SUFFIX DOES NOT WORK
Reintroduce environment variable MYSQL_GROUP_SUFFIX to be used as
--default-group-suffix value if not already set.
The environment variable was accidentally renamed to DEFAULT_GROUP_SUFFIX_ENV
in MySQL server 5.5.
| -rw-r--r-- | mysys/default.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/default.c b/mysys/default.c index 6fe00af087e..75274f25edf 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -234,7 +234,7 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, (char **) &my_defaults_group_suffix); if (! my_defaults_group_suffix) - my_defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV)); + my_defaults_group_suffix= getenv("MYSQL_GROUP_SUFFIX"); if (forced_extra_defaults && !defaults_already_read) { |