bk commit into 5.0 tree (reggie:1.1812)

[reggie]

Below is the list of changes that have just been committed into a local
5.0 repository of reggie. When reggie 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.1812 05/03/15 11:42:31 reggie@mdk10.(none) +3 -0
  Merge mdk10.(none):/home/reggie/bk/mysql-4.1
  into mdk10.(none):/home/reggie/bk/mysql-5.0

  sql/sql_show.cc
    1.223 05/03/15 11:42:25 reggie@mdk10.(none) +0 -0
    Auto merged

  client/mysqldump.c
    1.172 05/03/15 11:42:24 reggie@mdk10.(none) +0 -0
    Auto merged

  BitKeeper/etc/logging_ok
    1.302 05/03/15 11:41:58 reggie@mdk10.(none) +0 -1
    auto-union

# 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:	reggie
# Host:	mdk10.(none)
# Root:	/home/reggie/bk/mysql-5.0/RESYNC

--- 1.171/client/mysqldump.c	2005-03-09 06:37:12 -06:00
+++ 1.172/client/mysqldump.c	2005-03-15 11:42:24 -06:00
@@ -1084,6 +1084,7 @@
   check_io(xml_file);
 }
 
+
 /*
   getStructure -- retrievs database structure, prints out corresponding
   CREATE statement and fills out insert_pat.

--- 1.222/sql/sql_show.cc	2005-03-05 05:34:18 -06:00
+++ 1.223/sql/sql_show.cc	2005-03-15 11:42:25 -06:00
@@ -703,7 +703,16 @@
     packet->append(' ');
     packet->append(dir_type);
     packet->append(" DIRECTORY='", 12);
+#ifdef __WIN__
+    char *winfilename = strdup(filename);
+    for (uint i=0; i < length; i++)
+	    if (winfilename[i] == '\\')
+		    winfilename[i] = '/';
+    packet->append(winfilename, length);
+    free(winfilename);
+#else
     packet->append(filename, length);
+#endif
     packet->append('\'');
   }
 }