bk commit into 5.1 tree (jmiller:1.2070)

[Jonathan Miller]

Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev 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.2070 06/01/24 13:26:21 jmiller@stripped +2 -0
  disabled.def:
    Updated to remove ndb_dd_disk2memory
  ndb_dd_disk2memory.result:
    Updated results to match change to show create table for NDB tables. WL 2604

  mysql-test/t/disabled.def
    1.49 06/01/24 13:24:49 jmiller@stripped +1 -1
    Updated to remove ndb_dd_disk2memory

  mysql-test/r/ndb_dd_disk2memory.result
    1.2 06/01/24 13:24:18 jmiller@stripped +4 -4
    Updated results to match change to show create table for NDB tables. WL 2604

# 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:	jmiller
# Host:	ndb08.mysql.com
# Root:	/home/ndbdev/jmiller/clones/mysql-5.1-new

--- 1.1/mysql-test/r/ndb_dd_disk2memory.result	2006-01-12 23:55:50 +01:00
+++ 1.2/mysql-test/r/ndb_dd_disk2memory.result	2006-01-24 13:24:18 +01:00
@@ -218,7 +218,7 @@
   `b2` int(11) NOT NULL,
   `c2` int(11) NOT NULL,
   PRIMARY KEY  (`pk2`)
-) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 SHOW CREATE TABLE test.t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -226,7 +226,7 @@
   `b` int(11) NOT NULL,
   `c` int(11) NOT NULL,
   PRIMARY KEY  (`pk1`)
-) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 ALTER TABLE test.t2 TABLESPACE table_space1 STORAGE DISK
 ENGINE=NDB;
 SHOW CREATE TABLE test.t2;
@@ -236,7 +236,7 @@
   `b2` int(11) NOT NULL,
   `c2` int(11) NOT NULL,
   PRIMARY KEY  (`pk2`)
-) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 ALTER TABLE test.t1 ENGINE=NDBCLUSTER;
 SHOW CREATE TABLE test.t1;
 Table	Create Table
@@ -245,7 +245,7 @@
   `b` int(11) NOT NULL,
   `c` int(11) NOT NULL,
   PRIMARY KEY  (`pk1`)
-) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1
+) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () 
 
 DROP TABLE test.t1;
 DROP TABLE test.t2;

--- 1.48/mysql-test/t/disabled.def	2006-01-24 01:12:10 +01:00
+++ 1.49/mysql-test/t/disabled.def	2006-01-24 13:24:49 +01:00
@@ -24,7 +24,7 @@
 ndb_binlog_basic   : Results are not deterministic, Tomas will fix
 rpl_ndb_basic   : Bug#16228
 rpl_sp          : Bug #16456
-ndb_dd_disk2memory : Bug #16466 & 16736
+#ndb_dd_disk2memory : Bug #16466 
 ndb_autodiscover : Needs to be fixed w.r.t binlog
 ndb_autodiscover2 : Needs to be fixed w.r.t binlog
 system_mysql_db : Needs fixing