diff options
| author | Timothy Smith <timothy.smith@sun.com> | 2008-07-17 11:45:08 -0600 |
|---|---|---|
| committer | Timothy Smith <timothy.smith@sun.com> | 2008-07-17 11:45:08 -0600 |
| commit | 44b549fd511a6fb540d03b9f5761d93b94aef920 (patch) | |
| tree | 8ab5b0b393ebad99efb0f852d2bf45f343f60f6f /mysys/default.c | |
| parent | 75518d0137f8acc265c327b954e8f3bb2438a0ab (diff) | |
| parent | 006a3a00591d81ec3e0a27480b98d65db7910198 (diff) | |
| download | mariadb-git-44b549fd511a6fb540d03b9f5761d93b94aef920.tar.gz | |
Up-merge 5.0.66a-release changes (via 5.0) into 5.1.
Includes fix for Bug #38180, "options are read from ~/my.cnf instead of ~/.my.cnf"
Diffstat (limited to 'mysys/default.c')
| -rw-r--r-- | mysys/default.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mysys/default.c b/mysys/default.c index 7803b81c31d..6b2b31d43ec 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -974,8 +974,7 @@ static int add_directory(MEM_ROOT *alloc, const char *dir, const char **dirs) char *p; my_bool err __attribute__((unused)); - /* Normalize directory name */ - len= unpack_dirname(buf, dir); + len= normalize_dirname(buf, dir); if (!(p= strmake_root(alloc, buf, len))) return 1; /* Failure */ /* Should never fail if DEFAULT_DIRS_SIZE is correct size */ @@ -1026,7 +1025,7 @@ static const char *my_get_module_parent(char *buf, size_t size) { char *last= NULL; char *end; - if (!GetModuleFileName(NULL, buf, size)) + if (!GetModuleFileName(NULL, buf, (DWORD) size)) return NULL; end= strend(buf); |