Commit 46455397 authored Oct 06, 2005 by unknown

merge

parent af01997d

mysql-test/r/ndb_partition_key.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

mysql-test/r/ndb_partition_range.result

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;