bk commit into 5.1 tree (lars:1.2095)

[Lars Thalmann]

Below is the list of changes that have just been committed into a local
5.1 repository of lthalmann. When lthalmann does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2095 06/02/14 02:18:41 lars@stripped +2 -0
  Removed version information from test

  mysql-test/t/binlog_stm_binlog.test
    1.4 06/02/14 02:18:33 lars@stripped +1 -1
    Removed version information from test

  mysql-test/r/binlog_stm_binlog.result
    1.7 06/02/14 02:18:33 lars@stripped +1 -1
    Removed version information from test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	lars
# Host:	dl145k.mysql.com
# Root:	/users/lthalmann/bk/mysql-5.1-new-bug17339

--- 1.3/mysql-test/t/binlog_stm_binlog.test	2006-02-06 18:25:03 +01:00
+++ 1.4/mysql-test/t/binlog_stm_binlog.test	2006-02-14 02:18:33 +01:00
@@ -5,7 +5,7 @@
 begin;
 insert into t1 values (1,2);
 commit;
---replace_regex /\/\* xid=.* \*\//\/* XID *\//
+--replace_regex /\/\* xid=.* \*\//\/* XID *\// /Server ver: .*, Binlog ver: .*/Server ver: #, Binlog ver: #/
 show binlog events;
 drop table t1;
 

--- 1.6/mysql-test/r/binlog_stm_binlog.result	2006-02-06 18:25:02 +01:00
+++ 1.7/mysql-test/r/binlog_stm_binlog.result	2006-02-14 02:18:33 +01:00
@@ -4,7 +4,7 @@
 commit;
 show binlog events;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	4	Format_desc	1	102	Server ver: 5.1.7-beta-debug-log, Binlog ver: 4
+master-bin.000001	4	Format_desc	1	102	Server ver: #, Binlog ver: #
 master-bin.000001	102	Query	1	209	use `test`; create table t1 (a int, b int) engine=innodb
 master-bin.000001	209	Query	1	277	use `test`; BEGIN
 master-bin.000001	277	Query	1	90	use `test`; insert into t1 values (1,2)