bk commit into 5.1 tree (mleich:1.2363)

[mleich]

Below is the list of changes that have just been committed into a local
5.1 repository of mleich. When mleich 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.2363 06/04/20 11:21:29 mleich@stripped +1 -0
  Merge three.local.lan:/home/matthias/Arbeit/mysql-5.1/src
  into  three.local.lan:/home/matthias/Arbeit/mysql-5.1/src-1

  mysql-test/t/disabled.def
    1.135 06/04/20 11:18:45 mleich@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:	mleich
# Host:	three.local.lan
# Root:	/home/matthias/Arbeit/mysql-5.1/src-1/RESYNC

--- 1.134/mysql-test/t/disabled.def	2006-04-18 12:58:52 +02:00
+++ 1.135/mysql-test/t/disabled.def	2006-04-20 11:18:45 +02:00
@@ -28,9 +28,9 @@
 rpl_ndb_innodb2ndb       : BUG#18094 2006-03-16 mats Slave caches invalid table
definition after atlters causes select failure
 rpl_ndb_log              : BUG#18947 2006-03-21 tomas CRBR: order in binlog of create
table and insert (on different table) not determ
 rpl_ndb_myisam2ndb       : BUG#18094 2006-03-16 mats   Slave caches invalid table
definition after atlters causes select failure
-rpl_ndb_relay_space      : BUG#16993 2006-02-16 jmiller RBR: ALTER TABLE ZEROFILL
AUTO_INCREMENT is not replicated correctly
+#rpl_ndb_relay_space      : BUG#16993 2006-02-16 jmiller RBR: ALTER TABLE ZEROFILL
AUTO_INCREMENT is not replicated correctly
 rpl_switch_stm_row_mixed : BUG#18590 2006-03-28 brian
-rpl_row_basic_7ndb       : BUG#17400 2006-04-09 brian   Cluster Replication: delete &
update of rows in table without pk fails on slave.
+#rpl_row_basic_7ndb       : BUG#17400 2006-04-09 brian   Cluster Replication: delete
& update of rows in table without pk fails on slave.
 rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
 rpl_row_func003		 : BUG#19074 2006-13-04 andrei  test failed
 rpl_row_inexist_tbl      : BUG#18948 2006-03-09 mats    Disabled since patch makes this
test wait forever
@@ -47,6 +47,7 @@
 #ndb_load                 : BUG#17233 2006-02-16 jmiller failed load data from infile
causes mysqld dbug_assert, binlog not flushed
 #rpl_ndb_basic            : BUG#18592 2006-03-28 brian rpl_ndb_basic failure
 #rpl_ndb_dd_advance       : BUG#18924 2006-04-09 brian rpl_ndb_dd_advance failure
+rpl_ndb_dd_partitions     : BUG#18094 2006-04-19 mats Slave caches invalid table
definition...
 #rpl_ndb_dd_basic         : BUG#18569 2006-03-28 brian rpl_ndb_dd_basic failure
 #rpl_ndb_insert_ignore    : BUG#18567 2006-03-28 brian rpl_ndb_insert_ignore failure
 #rpl_ndb_multi_update2    : BUG#18928 2006-04-09 brian   rpl_ndb_multi_update2 failed