Commit b25d39d5 authored by nick@mysql.com's avatar nick@mysql.com
Browse files

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

into mysql.com:/home/nick/mysql/repository/mysql-4.0
parents e03d4330 96e9cd3a

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -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++ = '-';