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

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


BitKeeper/etc/logging_ok:
  auto-union
client/mysqldump.c:
  Auto merged
sql/sql_show.cc:
  Auto merged

client/mysqldump.c

@@ -1084,6 +1084,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

@@ -703,7 +703,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('\'');
   }
 }