bk commit into 5.1 tree (tomas:1.2316)

[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.2316 06/04/12 18:52:32 tomas@stripped +1 -0
  ndb: removed usage of unsupported binlog table: no pk + blob

  mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test
    1.3 06/04/12 18:52:26 tomas@stripped +4 -1
    ndb: removed usage of unsupported binlog table: no pk + blob

# 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.2/mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test	2006-02-28 16:03:11 +01:00
+++ 1.3/mysql-test/extra/rpl_tests/rpl_ndb_2multi_eng.test	2006-04-12 18:52:26 +02:00
@@ -51,8 +51,8 @@
 # Okay lets see how it holds up to table changes
 --echo --- Check that simple Alter statements are replicated correctly --
 
-ALTER TABLE t1 MODIFY vc TEXT;
 ALTER TABLE t1 DROP PRIMARY KEY, ADD PRIMARY KEY(id, total);
+ALTER TABLE t1 MODIFY vc TEXT;
 
 --echo --- Show the new improved table on the master ---
 
@@ -117,6 +117,7 @@
 
 --echo --- Check that simple Alter statements are replicated correctly ---
 
+ALTER TABLE t1 ADD PRIMARY KEY(t,id);
 ALTER TABLE t1 MODIFY vc TEXT;
 
 --echo --- Show the new improved table on the master ---
@@ -183,6 +184,7 @@
 
 --echo --- Check that simple Alter statements are replicated correctly ---
 
+ALTER TABLE t1 ADD PRIMARY KEY(id);
 ALTER TABLE t1 MODIFY vc TEXT;
 
 --echo --- Show the new improved table on the master ---
@@ -240,6 +242,7 @@
 --echo --- Check that simple Alter statements are replicated correctly ---
 
 ALTER TABLE t1 MODIFY vc TEXT;
+ALTER TABLE t1 ADD PRIMARY KEY(t,id);
 
 --echo --- Show the new improved table on the master ---