summaryrefslogtreecommitdiff
path: root/sql/log_event.cc
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 /sql/log_event.cc
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 'sql/log_event.cc')
-rw-r--r--sql/log_event.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc
index c0a06bf5dab..e7eb9c7bda6 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -121,7 +121,8 @@ static char *pretty_print_str(char *packet, char *str, int len)
static inline char* slave_load_file_stem(char*buf, uint file_id,
int event_server_id)
{
- fn_format(buf,"SQL_LOAD-",slave_load_tmpdir, "", MY_UNPACK_FILENAME);
+ fn_format(buf,"SQL_LOAD-",slave_load_tmpdir, "",
+ MY_UNPACK_FILENAME | MY_UNIX_PATH);
buf = strend(buf);
buf = int10_to_str(::server_id, buf, 10);
*buf++ = '-';