mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0
into a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0
This commit is contained in:
commit
0f5f6045a3
1 changed files with 1 additions and 1 deletions
|
@ -138,7 +138,7 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv,
|
|||
defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV));
|
||||
|
||||
if (forced_extra_defaults)
|
||||
defaults_extra_file= forced_extra_defaults;
|
||||
defaults_extra_file= (char *) forced_extra_defaults;
|
||||
|
||||
/*
|
||||
We can only handle 'defaults-group-suffix' if we are called from
|
||||
|
|
Loading…
Reference in a new issue