bk commit into 5.1 tree (mskold:1.2310)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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@stripped, 2006-09-15 16:10:37+02:00, mskold@stripped +1 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
  MERGE: 1.2300.15.10

  mysql-test/t/ndb_multi.test@stripped, 2006-09-15 16:10:23+02:00, mskold@stripped +0 -0
    Auto merged
    MERGE: 1.12.1.1

# 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:	mskold
# Host:	linux.site
# Root:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb/RESYNC

--- 1.13/mysql-test/t/ndb_multi.test	2006-09-15 16:10:49 +02:00
+++ 1.14/mysql-test/t/ndb_multi.test	2006-09-15 16:10:49 +02:00
@@ -68,5 +68,26 @@ show tables like 't4';
 show tables;
 
 drop table t1, t2, t3, t4;
+# bug#21378
+connection server1;
+create table t1(c1 int key)ENGINE=MyISAM;
+insert into t1 values(1),(3),(5);
+select * from t1 order by c1;
 
+connection server2;
+create table t1(c1 int key)ENGINE=MyISAM;
+insert into t1 values(100),(344),(533);
+select * from t1 order by c1;
+
+connection server1;
+alter table t1 engine=ndb;
+
+connection server2;
+show tables;
+select * from t1 order by c1;
+drop table t1;
+
+connection server1;
+select * from t1 order by c1;
+drop table t1;
 # End of 4.1 tests