Merge paul@work.mysql.com:/home/bk/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0

sql/log_event.cc

@@ -100,7 +100,7 @@ static void pretty_print_str(String* packet, char* str, int len)
 static inline char* slave_load_file_stem(char*buf, uint file_id,
 					 int event_server_id)
 {
-  fn_format(buf,"SQL_LOAD-",slave_load_tmpdir,"",4+32);
+  fn_format(buf,"SQL_LOAD-",slave_load_tmpdir,"",0); /* 4+32); */
   buf = strend(buf);
   buf = int10_to_str(::server_id, buf, 10);
   *buf++ = '-';