diff options
author | reggie@mdk10.(none) <> | 2005-05-23 12:31:22 -0500 |
---|---|---|
committer | reggie@mdk10.(none) <> | 2005-05-23 12:31:22 -0500 |
commit | c492ffcf2edd4454f11224b616328a2d1b2c8a39 (patch) | |
tree | a8164dc0779d5dd4934de3f2c07f972675bccfb0 /mysys | |
parent | 799b773aae73f0fb185c446b8a771fd836f75fcc (diff) | |
download | mariadb-git-c492ffcf2edd4454f11224b616328a2d1b2c8a39.tar.gz |
BUG#10687 - Merge engine fails under Windows
This final cset is to fix a syntax problem in ha_myisammrg.cc where a / was left out of a format string.
It also adds a check in has_path to avoid a possible redundant comparison.
ha_myisammrg.cc:
Replaced missing / in format string
my_getwd.c:
Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison
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 14d68168acd..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)) || test(strchr(name,'/')) + return test(strchr(name, FN_LIBCHAR)) +#if FN_LIBCHAR != '/' + || test(strchr(name,'/')) +#endif #ifdef FN_DEVCHAR || test(strchr(name, FN_DEVCHAR)) #endif |