diff options
| author | SergeyV@selena. <> | 2005-08-31 18:44:02 +0400 |
|---|---|---|
| committer | SergeyV@selena. <> | 2005-08-31 18:44:02 +0400 |
| commit | 341eac5d25e2f48f459956d81c6204850bd8abcd (patch) | |
| tree | 5697c635bb7b00e9eb04bf3ffcf04849ec8db297 | |
| parent | 04d75ab6e8db2b3e92ed0546e37e6bdc53db8b8c (diff) | |
| parent | 3fdd500288358b391853a3ec2cb5aaf117fadf22 (diff) | |
| download | mariadb-git-341eac5d25e2f48f459956d81c6204850bd8abcd.tar.gz | |
Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0
into selena.:H:/MYSQL/src/#11815-mysql-5.0
| -rw-r--r-- | VC++Files/mysys/mysys.dsp | 4 | ||||
| -rw-r--r-- | include/my_sys.h | 1 | ||||
| -rw-r--r-- | mysys/mf_format.c | 2 | ||||
| -rw-r--r-- | sql/log_event.cc | 3 |
4 files changed, 9 insertions, 1 deletions
diff --git a/VC++Files/mysys/mysys.dsp b/VC++Files/mysys/mysys.dsp index e239318d54d..230c2221b6e 100644 --- a/VC++Files/mysys/mysys.dsp +++ b/VC++Files/mysys/mysys.dsp @@ -317,6 +317,10 @@ SOURCE=.\mf_tempfile.c # End Source File # Begin Source File +SOURCE=.\mf_unixpath.c +# End Source File +# Begin Source File + SOURCE=.\mf_wcomp.c # End Source File # Begin Source File diff --git a/include/my_sys.h b/include/my_sys.h index 11e8a36f5fa..c46da655fa4 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -98,6 +98,7 @@ extern int NEAR my_errno; /* Last error in mysys */ #define MY_RETURN_REAL_PATH 32 /* return full path for file */ #define MY_SAFE_PATH 64 /* Return NULL if too long path */ #define MY_RELATIVE_PATH 128 /* name is relative to 'dir' */ +#define MY_UNIX_PATH 256 /* convert path to UNIX format */ /* My seek flags */ #define MY_SEEK_SET 0 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 */ 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++ = '-'; |