bk commit into 5.1 tree (tomas:1.2375) BUG#16445

[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.2375 06/05/15 10:50:31 tomas@stripped +2 -0
  Bug#16445 ndb, removed workaround in test to see if rewrite of dict cache has worked to remove this bug

  mysql-test/t/ndb_basic.test
    1.42 06/05/15 10:50:25 tomas@stripped +10 -11
    Bug#16445 ndb, removed workaround in test to see if rewrite of dict cache has worked to remove this bug

  mysql-test/r/ndb_basic.result
    1.41 06/05/15 10:50:25 tomas@stripped +0 -7
    Bug#16445 ndb, removed workaround in test to see if rewrite of dict cache has worked to remove this bug

# 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-ndb

--- 1.40/mysql-test/r/ndb_basic.result	2006-05-04 05:28:20 +02:00
+++ 1.41/mysql-test/r/ndb_basic.result	2006-05-15 10:50:25 +02:00
@@ -6,13 +6,6 @@
 attr2 INT,
 attr3 VARCHAR(10)
 ) ENGINE=ndbcluster;
-drop table t1;
-CREATE TABLE t1 (
-pk1 INT NOT NULL PRIMARY KEY,
-attr1 INT NOT NULL,
-attr2 INT,
-attr3 VARCHAR(10)
-) ENGINE=ndbcluster;
 SHOW INDEX FROM t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment
 t1	0	PRIMARY	1	pk1	A	0	NULL	NULL		BTREE	

--- 1.41/mysql-test/t/ndb_basic.test	2006-05-04 05:28:20 +02:00
+++ 1.42/mysql-test/t/ndb_basic.test	2006-05-15 10:50:25 +02:00
@@ -6,17 +6,16 @@
 drop database if exists mysqltest;
 --enable_warnings
 
-# workaround for bug#16445
-# remove to reproduce bug and run tests from ndb start
-# and with ndb_autodiscover disabled. Fails on Linux 50 % of the times
-
-CREATE TABLE t1 (
-  pk1 INT NOT NULL PRIMARY KEY,
-  attr1 INT NOT NULL,
-  attr2 INT,
-  attr3 VARCHAR(10)
-) ENGINE=ndbcluster;
-drop table t1;
+## workaround for bug#16445
+## remove to reproduce bug and run tests from ndb start
+## and with ndb_autodiscover disabled. Fails on Linux 50 % of the times
+#CREATE TABLE t1 (
+#  pk1 INT NOT NULL PRIMARY KEY,
+#  attr1 INT NOT NULL,
+#  attr2 INT,
+#  attr3 VARCHAR(10)
+#) ENGINE=ndbcluster;
+#drop table t1;
 
 #
 # Basic test to show that the NDB