diff options
| author | Timothy Smith <timothy.smith@sun.com> | 2008-07-16 16:58:45 -0600 |
|---|---|---|
| committer | Timothy Smith <timothy.smith@sun.com> | 2008-07-16 16:58:45 -0600 |
| commit | aa5731dad97ec8ac95d2e4cdd43211460d546b29 (patch) | |
| tree | cbda323162d279022dc25bd0b06a82563506b19a /include | |
| parent | 3bcbaf6cbf18dc04ee2495cc6cd2bf8aa399ebb5 (diff) | |
| download | mariadb-git-aa5731dad97ec8ac95d2e4cdd43211460d546b29.tar.gz | |
Bug #38180 options are read from ~/my.cnf instead of ~/.my.cnf
Pull out some of unpack_dirname() into normalize_dirname(); this
new function does not expand "~" to the home directory. Use this
function in unpack_dirname(), and use it during init_default_directories()
to remove duplicate entries without losing track of which directory
is a user's home dir.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_sys.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index d656326e968..db01223602d 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -681,6 +681,7 @@ extern my_string fn_format(my_string to,const char *name,const char *dir, const char *form, uint flag); extern size_s strlength(const char *str); extern void pack_dirname(my_string to,const char *from); +extern uint normalize_dirname(char * to, const char *from); extern uint unpack_dirname(my_string to,const char *from); extern uint cleanup_dirname(my_string to,const char *from); extern uint system_filename(my_string to,const char *from); |