Merge sgluhov@work.mysql.com:/home/bk/mysql-4.1

into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.upd


sql/log_event.cc:
  Auto merged

BitKeeper/etc/logging_ok

@@ -17,6 +17,7 @@ bell@sanja.is.com.ua
 bk@admin.bk
 davida@isil.mysql.com
 gluh@gluh.(none)
+gluh@gluh.mysql.r18.ru
 heikki@donna.mysql.fi
 heikki@hundin.mysql.fi
 heikki@rescue.

mysql-test/r/rpl_temporary.result

@@ -22,7 +22,7 @@ f
 7
 show binlog events;
 Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.000001	4	Start	1	4	Server ver: 4.1.0-alpha-debug-log, Binlog ver: 3
+master-bin.000001	4	Start	1	4	Server ver: VERSION, Binlog ver: 3
 master-bin.000001	79	Query	1	79	use `test`; create table t1(f int)
 master-bin.000001	136	Query	1	136	use `test`; create table t2(f int)
 master-bin.000001	193	Query	1	193	use `test`; insert into t1 values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10)

mysql-test/t/rpl_temporary.test

@@ -3,6 +3,8 @@ source include/master-slave.inc;
 connect (con1,localhost,root,,);
 connect (con2,localhost,root,,);
 
+let $VERSION=`select version()`;
+
 --disable_warnings
 drop table if exists t1,t2;
 --enable_warnings
@@ -38,6 +40,7 @@ drop temporary table t3;
 
 select * from t2;
 
+--replace_result $VERSION VERSION
 show binlog events;
 
 drop table t1, t2;