bk commit into 5.0 tree (jmiller:1.2014)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.0 repository of ndbdev. When ndbdev 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.2014 05/10/17 18:18:30 jmiller@stripped +2 -0
  rpl_row_delayed_ins.result, rpl_row_delayed_ins.test:
    Fixing test so that testing on builds that are not Server ver: 5.0.15-rc-debug-log
will not cause a failure

  mysql-test/r/rpl_row_delayed_ins.result
    1.5 05/10/17 18:18:17 jmiller@stripped +1 -1
    Fixing test so that testing on builds that are not Server ver: 5.0.15-rc-debug-log
will not cause a failure

  mysql-test/t/rpl_row_delayed_ins.test
    1.7 05/10/17 18:18:04 jmiller@stripped +2 -0
    Fixing test so that testing on builds that are not Server ver: 5.0.15-rc-debug-log
will not cause a failure

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/mysql-5.0-wl1012

--- 1.4/mysql-test/r/rpl_row_delayed_ins.result	2005-10-14 21:38:40 +02:00
+++ 1.5/mysql-test/r/rpl_row_delayed_ins.result	2005-10-17 18:18:17 +02:00
@@ -14,7 +14,7 @@
 3
 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.0.15-rc-debug-log, Binlog ver: 4
+master-bin.000001	4	Format_desc	1	102	Server ver: VERSION, Binlog ver: 4
 master-bin.000001	102	Query	1	222	use `test`; create table t1(a int not null primary key)
engine=myisam
 master-bin.000001	222	Table_map	1	259	test.t1
 master-bin.000001	259	Write_rows	1	301	

--- 1.6/mysql-test/t/rpl_row_delayed_ins.test	2005-10-14 21:38:40 +02:00
+++ 1.7/mysql-test/t/rpl_row_delayed_ins.test	2005-10-17 18:18:04 +02:00
@@ -5,6 +5,7 @@
 -- source include/master-slave.inc
 
 connection master;
+let $VERSION=`select version()`;
 create table t1(a int not null primary key) engine=myisam;
 insert delayed into t1 values (1),(2),(3);
 # force DELAYED thread to execute. We don't write FLUSH TABLES
@@ -14,6 +15,7 @@
 sync_slave_with_master;
 
 connection master;
+--replace_result $VERSION VERSION
 show binlog events;
 sync_slave_with_master;
 select * from t1;