List:Internals« Previous MessageNext Message »
From:monty Date:March 16 2005 12:30am
Subject:bk commit into 5.0 tree (monty:1.1811)
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of monty. When monty 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.1811 05/03/16 01:30:28 monty@stripped +2 -0
  Merge bk-internal.mysql.com:/home/bk/mysql-5.0
  into mysql.com:/home/my/mysql-5.0

  sql/sql_show.cc
    1.224 05/03/16 01:30:27 monty@stripped +0 -0
    Auto merged

  sql/mysqld.cc
    1.438 05/03/16 01:30:27 monty@stripped +0 -0
    Auto merged

# 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:	monty
# Host:	narttu.mysql.com
# Root:	/home/my/mysql-5.0/RESYNC

--- 1.223/sql/sql_show.cc	2005-03-15 16:07:24 +02:00
+++ 1.224/sql/sql_show.cc	2005-03-16 01:30:27 +02:00
@@ -703,7 +703,15 @@
     packet->append(' ');
     packet->append(dir_type);
     packet->append(" DIRECTORY='", 12);
+#ifdef __WIN__
+    char *winfilename = thd->memdup(filename, length);
+    for (uint i=0; i < length; i++)
+	    if (winfilename[i] == '\\')
+		    winfilename[i] = '/';
+    packet->append(winfilename, length);
+#else
     packet->append(filename, length);
+#endif
     packet->append('\'');
   }
 }
Thread
bk commit into 5.0 tree (monty:1.1811)monty16 Mar