bk commit into 5.0 tree (jmiller:1.1974)

[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.1974 05/09/19 15:12:56 jmiller@stripped +2 -0
  RBR testing updates

  mysql-test/t/disabled.def
    1.17 05/09/19 15:12:15 jmiller@stripped +1 -1
    commented out rpl_row_sp000 due to patch for 12134. Test now passes

  mysql-test/t/rpl_row_sp000.test
    1.3 05/09/19 15:11:30 jmiller@stripped +1 -1
    removed ; that was not needed causing test to fail

# 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.2/mysql-test/t/rpl_row_sp000.test	2005-08-26 02:39:10 +02:00
+++ 1.3/mysql-test/t/rpl_row_sp000.test	2005-09-19 15:11:30 +02:00
@@ -33,7 +33,7 @@
 connection master;
 
 delimiter |;
---error 0,1418; # not deterministic
+--error 0,1418 # not deterministic
 CREATE PROCEDURE mtest.p1()
 BEGIN
   DECLARE b INT;

--- 1.16/mysql-test/t/disabled.def	2005-09-15 18:09:31 +02:00
+++ 1.17/mysql-test/t/disabled.def	2005-09-19 15:12:15 +02:00
@@ -24,7 +24,7 @@
 rpl_row_timezone:Timestamp incorrectly replicated Bug 12443
 #rpl_row_multi_update3:Slave-CORE Bug 12134
 rpl_row_000002:create table from temporary Bug 12345
-rpl_row_sp000:Rename from rpl_row_sp.test Bug 12134 Slave-CORE
+#rpl_row_sp000:Rename from rpl_row_sp.test Bug 12134 Slave-CORE
 #rpl_multi_delete:Bug 12536 Slave Core
 #rpl_row_basic_2myisam:Bug 12326 Slave Core
 rpl_row_view:Bug 12444 Slave Core