diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-01-18 17:54:48 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-01-18 17:54:48 +0100 |
| commit | 2d52d3c1bf46d2d5123ee986fff94858899cdf33 (patch) | |
| tree | 31b0004b988f6169bd7f703a66f8ddc3189d332f /mysys | |
| parent | 8aff418ec867419950bc2e0010f679b8f0216829 (diff) | |
| parent | 946d9e4db4896992400cabbd0d1db9a0a10cbfd1 (diff) | |
| download | mariadb-git-2d52d3c1bf46d2d5123ee986fff94858899cdf33.tar.gz | |
Merge branch 'mysql/5.5' into 5.5
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/default.c b/mysys/default.c index 39c9b0226f2..93a1eff37cb 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2011, 2018, MariaDB Corporation 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 +235,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) { |