Commit 5659853f authored by jimw@mysql.com's avatar jimw@mysql.com

Fix results due to change in SHOW CREATE TABLE output

parent 4d483fa2
...@@ -8,7 +8,7 @@ Table Create Table ...@@ -8,7 +8,7 @@ Table Create Table
t1 CREATE TABLE `t1` ( t1 CREATE TABLE `t1` (
`pk1` int(11) NOT NULL, `pk1` int(11) NOT NULL,
`b` bit(64) default NULL, `b` bit(64) default NULL,
PRIMARY KEY (`pk1`) PRIMARY KEY (`pk1`)
) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY ()
insert into t1 values insert into t1 values
(0,b'1111111111111111111111111111111111111111111111111111111111111111'), (0,b'1111111111111111111111111111111111111111111111111111111111111111'),
......
...@@ -27,7 +27,7 @@ t1 CREATE TABLE `t1` ( ...@@ -27,7 +27,7 @@ t1 CREATE TABLE `t1` (
`pk1` int(11) NOT NULL, `pk1` int(11) NOT NULL,
`b` int(11) NOT NULL, `b` int(11) NOT NULL,
`c` int(11) NOT NULL, `c` int(11) NOT NULL,
PRIMARY KEY (`pk1`) PRIMARY KEY (`pk1`)
) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () ) TABLESPACE ts1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY ()
INSERT INTO t1 VALUES (0, 0, 0); INSERT INTO t1 VALUES (0, 0, 0);
SELECT * FROM t1; SELECT * FROM t1;
......
...@@ -217,7 +217,7 @@ t2 CREATE TABLE `t2` ( ...@@ -217,7 +217,7 @@ t2 CREATE TABLE `t2` (
`pk2` int(11) NOT NULL, `pk2` int(11) NOT NULL,
`b2` int(11) NOT NULL, `b2` int(11) NOT NULL,
`c2` int(11) NOT NULL, `c2` int(11) NOT NULL,
PRIMARY KEY (`pk2`) PRIMARY KEY (`pk2`)
) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY ()
SHOW CREATE TABLE test.t1; SHOW CREATE TABLE test.t1;
Table Create Table Table Create Table
...@@ -225,7 +225,7 @@ t1 CREATE TABLE `t1` ( ...@@ -225,7 +225,7 @@ t1 CREATE TABLE `t1` (
`pk1` int(11) NOT NULL, `pk1` int(11) NOT NULL,
`b` int(11) NOT NULL, `b` int(11) NOT NULL,
`c` int(11) NOT NULL, `c` int(11) NOT NULL,
PRIMARY KEY (`pk1`) PRIMARY KEY (`pk1`)
) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () ) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY ()
ALTER TABLE test.t2 TABLESPACE table_space1 STORAGE DISK ALTER TABLE test.t2 TABLESPACE table_space1 STORAGE DISK
ENGINE=NDB; ENGINE=NDB;
...@@ -235,7 +235,7 @@ t2 CREATE TABLE `t2` ( ...@@ -235,7 +235,7 @@ t2 CREATE TABLE `t2` (
`pk2` int(11) NOT NULL, `pk2` int(11) NOT NULL,
`b2` int(11) NOT NULL, `b2` int(11) NOT NULL,
`c2` int(11) NOT NULL, `c2` int(11) NOT NULL,
PRIMARY KEY (`pk2`) PRIMARY KEY (`pk2`)
) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () ) TABLESPACE table_space1 STORAGE DISK ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY ()
ALTER TABLE test.t1 ENGINE=NDBCLUSTER; ALTER TABLE test.t1 ENGINE=NDBCLUSTER;
SHOW CREATE TABLE test.t1; SHOW CREATE TABLE test.t1;
...@@ -244,7 +244,7 @@ t1 CREATE TABLE `t1` ( ...@@ -244,7 +244,7 @@ t1 CREATE TABLE `t1` (
`pk1` int(11) NOT NULL, `pk1` int(11) NOT NULL,
`b` int(11) NOT NULL, `b` int(11) NOT NULL,
`c` int(11) NOT NULL, `c` int(11) NOT NULL,
PRIMARY KEY (`pk1`) PRIMARY KEY (`pk1`)
) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY ()
DROP TABLE test.t1; DROP TABLE test.t1;
......
...@@ -77,7 +77,7 @@ t1 CREATE TABLE `t1` ( ...@@ -77,7 +77,7 @@ t1 CREATE TABLE `t1` (
`b` char(10) character set latin1 collate latin1_bin NOT NULL default '', `b` char(10) character set latin1 collate latin1_bin NOT NULL default '',
`c` int(11) NOT NULL default '0', `c` int(11) NOT NULL default '0',
`d` int(11) default NULL, `d` int(11) default NULL,
PRIMARY KEY USING HASH (`a`,`b`,`c`) 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; DROP TABLE t1;
CREATE TABLE t1 (a int not null primary key) CREATE TABLE t1 (a int not null primary key)
......
...@@ -113,7 +113,7 @@ t1 CREATE TABLE `t1` ( ...@@ -113,7 +113,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL, `a` int(11) NOT NULL,
`b` int(11) NOT NULL, `b` int(11) NOT NULL,
`c` int(11) NOT NULL, `c` int(11) NOT NULL,
PRIMARY KEY (`b`), PRIMARY KEY (`b`),
UNIQUE KEY `a` (`a`) 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; drop table t1;
...@@ -16,6 +16,6 @@ show create table t1; ...@@ -16,6 +16,6 @@ show create table t1;
Table Create Table Table Create Table
t1 CREATE TEMPORARY TABLE `t1` ( t1 CREATE TEMPORARY TABLE `t1` (
`a` int(11) NOT NULL, `a` int(11) NOT NULL,
PRIMARY KEY (`a`) PRIMARY KEY (`a`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
drop table t1; drop table t1;
...@@ -32,7 +32,7 @@ t1 CREATE TABLE `t1` ( ...@@ -32,7 +32,7 @@ t1 CREATE TABLE `t1` (
`a` int(11) NOT NULL default '0', `a` int(11) NOT NULL default '0',
`blob_column` longblob, `blob_column` longblob,
`vchar_column` varchar(100) default NULL, `vchar_column` varchar(100) default NULL,
PRIMARY KEY (`a`) PRIMARY KEY (`a`)
) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY () ) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY ()
DROP PROCEDURE test.p1; DROP PROCEDURE test.p1;
DROP FUNCTION test.fn1; DROP FUNCTION test.fn1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment