Commit 8699f77c authored by unknown's avatar unknown
Browse files

Merge svlasenko@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  selena.:H:/MYSQL/src/#11815-mysql-5.0
parents ec0f18c2 bffb5d00

VC++Files/mysys/mysys.dsp

+4 −0
Original line number Diff line number Diff line
@@ -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

include/my_sys.h

+1 −0
Original line number Diff line number Diff line
@@ -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

mysys/mf_format.c

+2 −0
Original line number Diff line number Diff line
@@ -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 */

sql/log_event.cc

+2 −1
Original line number Diff line number Diff line
@@ -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++ = '-';