diff options
| author | monty@mysql.com <> | 2005-10-08 03:37:23 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2005-10-08 03:37:23 +0300 |
| commit | 17d7ba931d2293f1db89cbd1107a4bc71bc4fcdf (patch) | |
| tree | ac2ca2aacd05cc4eb1bec0b1f8c909b9d64fa2e6 /sql/log_event.cc | |
| parent | dad1e2048d3ac1477557a2645ccd323143601723 (diff) | |
| parent | f577ebb88fc4f56f440ee3736b54512d528ca0a9 (diff) | |
| download | mariadb-git-17d7ba931d2293f1db89cbd1107a4bc71bc4fcdf.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/my/mysql-5.0
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 5cb4c289a10..55c761d4c6e 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -121,8 +121,9 @@ 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 | MY_UNIX_PATH); + fn_format(buf,"SQL_LOAD-",slave_load_tmpdir, "", MY_UNPACK_FILENAME); + to_unix_path(buf); + buf = strend(buf); buf = int10_to_str(::server_id, buf, 10); *buf++ = '-'; |