bk commit into 5.1 tree (stewart:1.2540)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.1 repository of stewart. When stewart 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, 2007-06-13 23:34:22+10:00, stewart@stripped +2 -0
  [PATCH] Enable test for (Closed) bug 16445
  
  Bug was updated on May 30th by Tomas to say that hasn't been seen in PB
  since global dict cache rewrite. This test should probably be enabled then.
  
  Index: ndb-work/mysql-test/t/ndb_basic.test
  ===================================================================

  mysql-test/r/ndb_basic.result@stripped, 2007-05-11 14:56:15+10:00, stewart@stripped +7 -0
    Enable test for (Closed) bug 16445

  mysql-test/t/ndb_basic.test@stripped, 2007-05-11 14:51:06+10:00, stewart@stripped +10 -10
    Enable test for (Closed) bug 16445

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.1/ndb-merge

--- 1.56/mysql-test/r/ndb_basic.result	2007-05-16 15:25:33 +10:00
+++ 1.57/mysql-test/r/ndb_basic.result	2007-05-11 14:56:15 +10:00
@@ -1,5 +1,12 @@
 DROP TABLE IF EXISTS t1,t2,t3,t4,t5,t6,t7;
 drop database if exists mysqltest;
+CREATE TABLE t1 (
+pk1 INT NOT NULL PRIMARY KEY,
+attr1 INT NOT NULL,
+attr2 INT,
+attr3 VARCHAR(10)
+) ENGINE=ndbcluster;
+drop table t1;
 SHOW GLOBAL STATUS LIKE 'ndb%';
 Variable_name	Value
 Ndb_cluster_node_id	#

--- 1.57/mysql-test/t/ndb_basic.test	2007-05-16 15:19:49 +10:00
+++ 1.58/mysql-test/t/ndb_basic.test	2007-05-11 14:51:06 +10:00
@@ -6,16 +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