bk commit into 5.1 tree (tomas:1.2317)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.2317 06/04/12 19:38:40 tomas@stripped +2 -0
  test update

  mysql-test/t/disabled.def
    1.127 06/04/12 19:38:15 tomas@stripped +2 -2
    test update

  mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test
    1.4 06/04/12 19:38:14 tomas@stripped +1 -1
    test update

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-new

--- 1.3/mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test	2006-04-12 18:52:26 +02:00
+++ 1.4/mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test	2006-04-12 19:38:14 +02:00
@@ -241,8 +241,8 @@
 
 --echo --- Check that simple Alter statements are replicated correctly ---
 
-ALTER TABLE t1 MODIFY vc TEXT;
 ALTER TABLE t1 ADD PRIMARY KEY(t,id);
+ALTER TABLE t1 MODIFY vc TEXT;
 
 --echo --- Show the new improved table on the master ---
 

--- 1.126/mysql-test/t/disabled.def	2006-04-12 18:51:02 +02:00
+++ 1.127/mysql-test/t/disabled.def	2006-04-12 19:38:15 +02:00
@@ -19,8 +19,8 @@
 #ndb_load                : Bug#17233 failed load data from infile causes mysqld
dbug_assert, binlog not flushed
 partition_03ndb         : Bug#16385 Partitions: crash when updating a range partitioned
NDB table
 ps_7ndb                 : dbug assert in RBR mode when executing test suite
-rpl_ndb_2innodb         : Bug #19004 ndb: partition by range and update hangs (note, test
must also be updated to have primary key with blob table)
-rpl_ndb_2myisam         : Bug #19004 ndb: partition by range and update hangs (note, test
must also be updated to have primary key with blob table)
+rpl_ndb_2innodb         : Bug #19004 ndb: partition by range and update hangs
+rpl_ndb_2myisam         : Bug #19004 ndb: partition by range and update hangs
 rpl_ndb_auto_inc        : Bug#17086 CR: auto_increment_increment and
auto_increment_offset produce duplicate key er
 #rpl_ndb_basic           : Bug #18592 rpl_ndb_basic failure
 #rpl_ndb_dd_advance      : Bug #18924 rpl_ndb_dd_advance failure