bk commit into 5.0 tree (SergeyV:1.1908) BUG#11815

[sergeyv]

Below is the list of changes that have just been committed into a local
5.0 repository of sergeyv. When sergeyv does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1908 05/08/30 22:19:15 SergeyV@selena. +4 -0
  Fixes bug #11815. Convert file path to UNIX format to build correct query 
  string while replicating LOAD DATA INFILE statement.

  sql/log_event.cc
    1.189 05/08/30 22:19:07 SergeyV@selena. +2 -1
    Convert file path to UNIX format to build correct query string while replicating
    LOAD DATA INFILE statement.

  mysys/mf_format.c
    1.20 05/08/30 22:19:06 SergeyV@selena. +2 -0
    Added an option for fn_format function to convert path from system
    representation to UNIX format.

  include/my_sys.h
    1.167 05/08/30 22:19:05 SergeyV@selena. +1 -0
    Added an option for fn_format function to convert path from system representation
    to UNIX format.

  VC++Files/mysys/mysys.dsp
    1.29 05/08/30 22:19:04 SergeyV@selena. +4 -0
    added mf_unixpath.c into mysys.dsp

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	SergeyV
# Host:	selena.
# Root:	H:/MYSQL/src/#11815-mysql-5.0

--- 1.166/include/my_sys.h	2005-08-19 22:55:19 +04:00
+++ 1.167/include/my_sys.h	2005-08-30 22:19:05 +04:00
@@ -98,6 +98,7 @@
 #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

--- 1.19/mysys/mf_format.c	2004-09-07 10:55:31 +04:00
+++ 1.20/mysys/mf_format.c	2005-08-30 22:19:06 +04:00
@@ -54,6 +54,8 @@
     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 */

--- 1.188/sql/log_event.cc	2005-08-24 13:12:11 +04:00
+++ 1.189/sql/log_event.cc	2005-08-30 22:19:07 +04:00
@@ -121,7 +121,8 @@
 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++ = '-';

--- 1.28/VC++Files/mysys/mysys.dsp	2005-07-18 16:31:57 +04:00
+++ 1.29/VC++Files/mysys/mysys.dsp	2005-08-30 22:19:04 +04:00
@@ -317,6 +317,10 @@
 # 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