From 46455397b325733992a43256941db5d2d841eea1 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 6 Oct 2005 12:47:40 +0200 Subject: [PATCH] merge --- mysql-test/r/ndb_partition_key.result | 2 +- mysql-test/r/ndb_partition_range.result | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/r/ndb_partition_key.result b/mysql-test/r/ndb_partition_key.result index f483b5674e0..9cc7147bd77 100644 --- a/mysql-test/r/ndb_partition_key.result +++ b/mysql-test/r/ndb_partition_key.result @@ -76,5 +76,5 @@ t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL default '0', `d` int(11) default NULL, PRIMARY KEY USING HASH (`a`,`b`,`c`) -) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1 PARTITION BY KEY (b) +) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (b) DROP TABLE t1; diff --git a/mysql-test/r/ndb_partition_range.result b/mysql-test/r/ndb_partition_range.result index adead80ca20..d484f37ad3d 100644 --- a/mysql-test/r/ndb_partition_range.result +++ b/mysql-test/r/ndb_partition_range.result @@ -110,5 +110,5 @@ t1 CREATE TABLE `t1` ( `c` int(11) NOT NULL, PRIMARY KEY (`b`), UNIQUE KEY `a` (`a`) -) ENGINE=NDBCLUSTER DEFAULT CHARSET=latin1 PARTITION BY RANGE (b) (PARTITION x1 VALUES LESS THAN (5) ENGINE = NDBCLUSTER, PARTITION x2 VALUES LESS THAN (10) ENGINE = NDBCLUSTER, PARTITION x3 VALUES LESS THAN (20) ENGINE = NDBCLUSTER) +) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY RANGE (b) (PARTITION x1 VALUES LESS THAN (5) ENGINE = ndbcluster, PARTITION x2 VALUES LESS THAN (10) ENGINE = ndbcluster, PARTITION x3 VALUES LESS THAN (20) ENGINE = ndbcluster) drop table t1;