Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-4.1

into mdk10.(none):/home/reggie/bk/mysql-4.1

BitKeeper/etc/logging_ok

@@ -190,6 +190,7 @@ ramil@mysql.com
 ranger@regul.home.lan
 rburnett@build.mysql.com
 reggie@bob.(none)
+reggie@mdk10.(none)
 root@home.(none)
 root@mc04.(none)
 root@x3.internalnet

client/mysqldump.c

@@ -1080,6 +1080,7 @@ static void print_xml_row(FILE *xml_file, const char *row_name,
   check_io(xml_file);
 }
 
+
 /*
   getStructure -- retrievs database structure, prints out corresponding
   CREATE statement and fills out insert_pat.

sql/sql_show.cc

@@ -1227,7 +1227,16 @@ static void append_directory(THD *thd, String *packet, const char *dir_type,
     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('\'');
   }
 }