diff options
| author | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 12:29:31 +0200 |
|---|---|---|
| committer | Vicențiu Ciorbaru <vicentiu@mariadb.org> | 2018-01-24 12:29:31 +0200 |
| commit | d833bb65d53b9a4375fa71cc485b4719fdb0ee53 (patch) | |
| tree | d1271339e1c3a660e4788a5c9913bfe54e0271f1 /mysys/my_default.c | |
| parent | e431d90065d277e62fa4f81a1654790f58a84146 (diff) | |
| parent | 76577e1e2602f3c30859a176808c433a263e1b0a (diff) | |
| download | mariadb-git-d833bb65d53b9a4375fa71cc485b4719fdb0ee53.tar.gz | |
Merge remote-tracking branch '5.5' into 10.0
Diffstat (limited to 'mysys/my_default.c')
| -rw-r--r-- | mysys/my_default.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/my_default.c b/mysys/my_default.c index 03cfa973b2c..5d9e4ffac88 100644 --- a/mysys/my_default.c +++ b/mysys/my_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) { |