diff options
author | tsmith@ramayana.hindu.god <> | 2007-11-07 15:23:50 -0700 |
---|---|---|
committer | tsmith@ramayana.hindu.god <> | 2007-11-07 15:23:50 -0700 |
commit | ef59ca3d78b80285c11e59b20451c88496abe513 (patch) | |
tree | f62111b4bcb958c086783f8ead0d072db6b0323a /include/my_sys.h | |
parent | 9dfa790ffcb3928c0cbed8fdbe0a8bad87ce1581 (diff) | |
download | mariadb-git-ef59ca3d78b80285c11e59b20451c88496abe513.tar.gz |
Bug #20748: Configuration files should not be read more than once
A user could not override system-wide settings in their ~/.my.cnf,
because the DEFAULT_SYSCONFDIR was being searched last. Also, in
some configurations (especially when the --sysconfdir compile-time
option is set to /etc or /etc/mysql), the system-wide my.cnf file
was read multiple times, causing confusion and potential problems.
Rearrange default directories to conform to the manual and logic.
Move --sysconfdir=<path> (DEFAULT_SYSCONFDIR) from the last default
directory to the middle of the list. $HOME/.my.cnf should be last,
so the user is able to override the system-wide settings.
Change init_default_directories() to remove duplicates from the
list.
Diffstat (limited to 'include/my_sys.h')
-rw-r--r-- | include/my_sys.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index 7df2718c7b1..8c0d620984c 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -691,6 +691,8 @@ extern WF_PACK *wf_comp(my_string str); extern int wf_test(struct wild_file_pack *wf_pack,const char *name); extern void wf_end(struct wild_file_pack *buffer); extern size_s strip_sp(my_string str); +extern my_bool array_append_string_unique(const char *str, + const char **array, size_t size); extern void get_date(my_string to,int timeflag,time_t use_time); extern void soundex(CHARSET_INFO *, my_string out_pntr, my_string in_pntr,pbool remove_garbage); extern int init_record_cache(RECORD_CACHE *info,uint cachesize,File file, |