bk commit into 5.1 tree (mskold:1.2321) BUG#21378

[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-18 13:00:21+02:00, mskold@stripped +2 -0
  Bug #21378  Alter table from X storage engine to NDB could cause data loss: added show tables to ensure tables are gone

  mysql-test/r/ndb_multi.result@stripped, 2006-09-18 13:00:03+02:00, mskold@stripped +2 -0
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: added show tables to ensure tables are gone

  mysql-test/t/ndb_multi.test@stripped, 2006-09-18 13:00:03+02:00, mskold@stripped +1 -0
    Bug #21378  Alter table from X storage engine to NDB could cause data loss: added show tables to ensure tables are gone

# 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

--- 1.10/mysql-test/r/ndb_multi.result	2006-09-18 13:00:34 +02:00
+++ 1.11/mysql-test/r/ndb_multi.result	2006-09-18 13:00:34 +02:00
@@ -67,6 +67,8 @@ c1
 1
 3
 5
+show tables;
+Tables_in_test
 create table t1(c1 int key)ENGINE=MyISAM;
 insert into t1 values(100),(344),(533);
 select * from t1 order by c1;

--- 1.13/mysql-test/t/ndb_multi.test	2006-09-18 13:00:34 +02:00
+++ 1.14/mysql-test/t/ndb_multi.test	2006-09-18 13:00:34 +02:00
@@ -76,6 +76,7 @@ insert into t1 values(1),(3),(5);
 select * from t1 order by c1;
 
 connection server2;
+show tables;
 create table t1(c1 int key)ENGINE=MyISAM;
 insert into t1 values(100),(344),(533);
 select * from t1 order by c1;