summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authorreggie@mdk10.(none) <>2005-05-23 12:55:39 -0500
committerreggie@mdk10.(none) <>2005-05-23 12:55:39 -0500
commitc5f68180f443f94c590fa2a4fa045010a3d1a32f (patch)
treefdf4ef1c0fd648f3c53d65cdd4fb1e34a004c4b6 /mysys
parentd0f51ad8d89015d47970ecb3afd12c910cbf8edf (diff)
parentc492ffcf2edd4454f11224b616328a2d1b2c8a39 (diff)
downloadmariadb-git-c5f68180f443f94c590fa2a4fa045010a3d1a32f.tar.gz
merged changes from 4.1
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_getwd.c5
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