diff options
| author | unknown <reggie@mdk10.(none)> | 2005-05-23 12:55:39 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-05-23 12:55:39 -0500 |
| commit | b096c34d9220c0d892716befef6be5d9b1393dde (patch) | |
| tree | fdf4ef1c0fd648f3c53d65cdd4fb1e34a004c4b6 /mysys | |
| parent | c273526d85d26be7c31f28da0174f67b08aef9c8 (diff) | |
| parent | 67c5514b908a6adfb0cd91dfe6dc9d0b0e21e1c1 (diff) | |
| download | mariadb-git-b096c34d9220c0d892716befef6be5d9b1393dde.tar.gz | |
merged changes from 4.1
include/my_global.h:
Auto merged
ndb/src/cw/cpcd/Process.cpp:
Auto merged
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
Auto merged
strings/my_vsnprintf.c:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_getwd.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysys/my_getwd.c b/mysys/my_getwd.c index 89f949eca27..5663ceaa60e 100644 --- a/mysys/my_getwd.c +++ b/mysys/my_getwd.c @@ -208,7 +208,10 @@ int test_if_hard_path(register const char *dir_name) my_bool has_path(const char *name) { - return test(strchr(name, FN_LIBCHAR)) + return test(strchr(name, FN_LIBCHAR)) +#if FN_LIBCHAR != '/' + || test(strchr(name,'/')) +#endif #ifdef FN_DEVCHAR || test(strchr(name, FN_DEVCHAR)) #endif |