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/22 18:21:01 jmiller@stripped +3 -0
  test case clean up

  mysql-test/r/rpl_row_sp008.result
    1.2 05/10/22 18:20:38 jmiller@stripped +1 -1
    replace version in the show binlog

  mysql-test/t/rpl_row_sp008.test
    1.8 05/10/22 18:20:24 jmiller@stripped +2 -0
    replace version in the show binlog

  mysql-test/t/disabled.def
    1.34 05/10/22 18:19:14 jmiller@stripped +1 -1

# 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.1/mysql-test/r/rpl_row_sp008.result	2005-10-17 20:41:56 +02:00
+++ 1.2/mysql-test/r/rpl_row_sp008.result	2005-10-22 18:20:38 +02:00
@@ -31,7 +31,7 @@
 2
 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-log, Binlog ver: 4
+master-bin.000001	4	Format_desc	1	102	Server ver: VERSION, Binlog ver: 4
 master-bin.000001	102	Query	1	193	use `test`; DROP TABLE IF EXISTS test.t2
 master-bin.000001	193	Query	1	299	use `test`; CREATE TABLE test.t1 (a INT,PRIMARY KEY(a))
 master-bin.000001	299	Query	1	405	use `test`; CREATE TABLE test.t2 (a INT,PRIMARY KEY(a))

--- 1.7/mysql-test/t/rpl_row_sp008.test	2005-10-19 20:05:01 +02:00
+++ 1.8/mysql-test/t/rpl_row_sp008.test	2005-10-22 18:20:24 +02:00
@@ -47,6 +47,8 @@
 SELECT * FROM test.t2;
 
 connection master;
+let $VERSION=`select version()`;
+--replace_result $VERSION VERSION
 show binlog events;
 
 

--- 1.33/mysql-test/t/disabled.def	2005-10-21 11:12:47 +02:00
+++ 1.34/mysql-test/t/disabled.def	2005-10-22 18:19:14 +02:00
@@ -22,7 +22,7 @@
 rpl_row_timezone:Timestamp incorrectly replicated Bug 12443
 rpl_row_000002:create table from temporary Bug 12345
 rpl_row_sp005:Bug 12586
-rpl_row_sp006:Bug 12586
+rpl_row_sp006_InnoDB:Bug 12586
 #rpl_row_sp011:Bug 13360
 rpl_row_func002:Bug 12510
 rpl_row_trig002:Bug 12574 CORE