diff options
| author | unknown <reggie@mdk10.(none)> | 2005-05-23 12:31:22 -0500 |
|---|---|---|
| committer | unknown <reggie@mdk10.(none)> | 2005-05-23 12:31:22 -0500 |
| commit | 67c5514b908a6adfb0cd91dfe6dc9d0b0e21e1c1 (patch) | |
| tree | a8164dc0779d5dd4934de3f2c07f972675bccfb0 /mysys/my_getwd.c | |
| parent | 1b2a2c8647752b4c004d97ca9b7f847b0ecddb91 (diff) | |
| download | mariadb-git-67c5514b908a6adfb0cd91dfe6dc9d0b0e21e1c1.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
mysys/my_getwd.c:
Added test to see if FN_LIBCHAR != '/' before doing comparison to avoid redundant comparison
sql/ha_myisammrg.cc:
Replaced missing / in format string
Diffstat (limited to 'mysys/my_getwd.c')
| -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 |