bk commit into 5.1 tree (guilhem:1.1969)

[guilhem]

Below is the list of changes that have just been committed into a local
5.1 repository of guilhem. When guilhem 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.1969 05/11/21 16:36:42 guilhem@stripped +1 -0
  Merge gbichot@stripped:/home/bk/mysql-5.0-wl1012
  into  mysql.com:/home/mysql_src/mysql-5.1

  mysql-test/t/disabled.def
    1.14 05/11/21 16:36:37 guilhem@stripped +0 -0
    Auto merged

# 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:	guilhem
# Host:	gbichot3.local
# Root:	/home/mysql_src/mysql-5.1/RESYNC

--- 1.13/mysql-test/t/disabled.def	2005-11-19 16:14:04 +01:00
+++ 1.14/mysql-test/t/disabled.def	2005-11-21 16:36:37 +01:00
@@ -15,13 +15,10 @@
 rpl_until       : Unstable test case, bug#12429
 rpl_deadlock    : Unstable test case, bug#12429
 kill            : Unstable test case, bug#9712
-rpl_row_replicate_do:Causes wrong result on slave Bug 12421
 rpl_row_mystery22:shows rbr slave issues Bug 12418
 rpl_row_relayrotate:Bug 14082
-rpl_row_timezone:Timestamp incorrectly replicated Bug 12443
 rpl_row_000002:create table from temporary Bug 12345
 rpl_row_sp006_InnoDB:Bug 12586
-rpl_row_func002:Bug 12510
 rpl_row_view01:Bug 12687
 rpl_row_NOW:Bug 12574 
 rpl_bit_npk:Bug 13418