summaryrefslogtreecommitdiff
path: root/mysys/mf_format.c
diff options
context:
space:
mode:
authorunknown <SergeyV@selena.>2005-08-30 22:19:15 +0400
committerunknown <SergeyV@selena.>2005-08-30 22:19:15 +0400
commitbffb5d0048cb1541926c02c31868817e0d32d198 (patch)
treeac311a4aecc39e29d6e0f0a5597766f91d550488 /mysys/mf_format.c
parent11d32b4af305ba98f19d24adc65a04816bfb2861 (diff)
downloadmariadb-git-bffb5d0048cb1541926c02c31868817e0d32d198.tar.gz
Fixes bug #11815. Convert file path to UNIX format to build correct query
string while replicating LOAD DATA INFILE statement. VC++Files/mysys/mysys.dsp: added mf_unixpath.c into mysys.dsp include/my_sys.h: Added an option for fn_format function to convert path from system representation to UNIX format. mysys/mf_format.c: Added an option for fn_format function to convert path from system representation to UNIX format. sql/log_event.cc: Convert file path to UNIX format to build correct query string while replicating LOAD DATA INFILE statement.
Diffstat (limited to 'mysys/mf_format.c')
-rw-r--r--mysys/mf_format.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/mf_format.c b/mysys/mf_format.c
index d1ca1108d02..0fec9d27b1d 100644
--- a/mysys/mf_format.c
+++ b/mysys/mf_format.c
@@ -54,6 +54,8 @@ my_string fn_format(my_string to, const char *name, const char *dir,
pack_dirname(dev,dev); /* Put in ./.. and ~/.. */
if (flag & MY_UNPACK_FILENAME)
(void) unpack_dirname(dev,dev); /* Replace ~/.. with dir */
+ if (flag & MY_UNIX_PATH)
+ to_unix_path(dev); /* Fix to MySQL representation */
if ((pos= (char*) strchr(name,FN_EXTCHAR)) != NullS)
{
if ((flag & MY_REPLACE_EXT) == 0) /* If we should keep old ext */