bzr commit into mysql-5.0-bugteam branch (aelkin:2758) Bug#37313

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/bug37313-server_id_binlog/ based on revid:aelkin@stripped

 2758 Andrei Elkin	2009-02-24
      fixing compilation warning and adding flush logs to test of bug#37313
modified:
  mysql-test/r/mysqlbinlog.result
  mysql-test/t/mysqlbinlog.test
  sql/log_event.cc

=== modified file 'mysql-test/r/mysqlbinlog.result'
--- a/mysql-test/r/mysqlbinlog.result	2009-02-20 11:55:43 +0000
+++ b/mysql-test/r/mysqlbinlog.result	2009-02-24 14:17:34 +0000
@@ -364,6 +364,7 @@ drop table t1;
 shell> mysqlbinlog std_data/corrupt-relay-bin.000624 > var/tmp/bug31793.sql
 set @@global.server_id= 4294967295;
 reset master;
+flush logs;
 select
 (@a:=load_file("MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog"))
 is not null;

=== modified file 'mysql-test/t/mysqlbinlog.test'
--- a/mysql-test/t/mysqlbinlog.test	2009-02-20 11:55:43 +0000
+++ b/mysql-test/t/mysqlbinlog.test	2009-02-24 14:17:34 +0000
@@ -262,6 +262,7 @@ let $s_id_max=`select (1 << 32) - 1`;
 eval set @@global.server_id= $s_id_max;
 
 reset master;
+flush logs;
 --exec $MYSQL_BINLOG $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mysqlbinlog_bug37313.binlog
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval select

=== modified file 'sql/log_event.cc'
--- a/sql/log_event.cc	2009-02-20 11:55:43 +0000
+++ b/sql/log_event.cc	2009-02-24 14:17:34 +0000
@@ -976,7 +976,7 @@ void Log_event::print_header(FILE* file,
 
   fputc('#', file);
   print_timestamp(file);
-  fprintf(file, " server id %lu  end_log_pos %s ", server_id,
+  fprintf(file, " server id %lu  end_log_pos %s ", (ulong) server_id,
 	  llstr(log_pos,llbuff));
 
   /* mysqlbinlog --hexdump */