Commit 55f7266b authored by unknown's avatar unknown
Browse files

Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH

parent 484e89df

mysql-test/r/ndb_index_unique.result

+3 −3
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ CREATE TABLE t2 ( 
a int unsigned NOT NULL PRIMARY KEY,

b int unsigned not null,

c int unsigned not null,

UNIQUE USING HASH (b, c)	

UNIQUE (b, c) USING HASH	

) engine=ndbcluster;

insert t2 values(1, 2, 3), (2, 3, 5), (3, 4, 6), (4, 5, 8), (5,6, 2), (6,7, 2);

select * from t2 where a = 3;
@@ -142,14 +142,14 @@ CREATE TABLE t2 ( 
a int unsigned NOT NULL PRIMARY KEY,

b int unsigned not null,

c int unsigned,

UNIQUE USING HASH (b, c)	

UNIQUE (b, c) USING HASH	

) engine=ndbcluster;

ERROR 42000: Column 'c' is used with UNIQUE or INDEX but is not defined as NOT NULL

CREATE TABLE t3 (

a int unsigned NOT NULL,

b int unsigned not null,

c int unsigned,

PRIMARY KEY USING HASH (a, b)	

PRIMARY KEY (a, b) USING HASH         

) engine=ndbcluster;

insert t3 values(1, 2, 3), (2, 3, 5), (3, 4, 6), (4, 5, 8), (5,6, 2), (6,7, 2);

select * from t3 where a = 3;

mysql-test/r/ndb_partition_key.result

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ a b c 
1	12	3

DROP TABLE t1;

CREATE TABLE t1 (a INT, b CHAR(10) COLLATE latin1_bin, c INT, d INT,

PRIMARY KEY USING HASH (a,b,c))

PRIMARY KEY (a,b,c) USING HASH)

ENGINE=NDB

DEFAULT CHARSET=latin1

PARTITION BY KEY (b);
@@ -77,7 +77,7 @@ t1 CREATE TABLE `t1` ( 
  `b` char(10) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL DEFAULT '',

  `c` int(11) NOT NULL DEFAULT '0',

  `d` int(11) DEFAULT NULL,

  PRIMARY KEY USING HASH (`a`,`b`,`c`)

  PRIMARY KEY (`a`,`b`,`c`) USING HASH

) ENGINE=ndbcluster DEFAULT CHARSET=latin1 PARTITION BY KEY (b) 

DROP TABLE t1;

CREATE TABLE t1 (a int not null primary key)

mysql-test/t/ndb_index_unique.test

+3 −3
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ CREATE TABLE t2 ( 
  a int unsigned NOT NULL PRIMARY KEY,

  b int unsigned not null,

  c int unsigned not null,

  UNIQUE USING HASH (b, c)	

  UNIQUE (b, c) USING HASH	

) engine=ndbcluster;



insert t2 values(1, 2, 3), (2, 3, 5), (3, 4, 6), (4, 5, 8), (5,6, 2), (6,7, 2);
@@ -96,7 +96,7 @@ CREATE TABLE t2 ( 
  a int unsigned NOT NULL PRIMARY KEY,

  b int unsigned not null,

  c int unsigned,

  UNIQUE USING HASH (b, c)	

  UNIQUE (b, c) USING HASH	

) engine=ndbcluster;



#
@@ -107,7 +107,7 @@ CREATE TABLE t3 ( 
  a int unsigned NOT NULL,

  b int unsigned not null,

  c int unsigned,

  PRIMARY KEY USING HASH (a, b)	

  PRIMARY KEY (a, b) USING HASH         

) engine=ndbcluster;



insert t3 values(1, 2, 3), (2, 3, 5), (3, 4, 6), (4, 5, 8), (5,6, 2), (6,7, 2);

mysql-test/t/ndb_partition_key.test

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ DROP TABLE t1; 
#



CREATE TABLE t1 (a INT, b CHAR(10) COLLATE latin1_bin, c INT, d INT,

                 PRIMARY KEY USING HASH (a,b,c))

                 PRIMARY KEY (a,b,c) USING HASH)

                 ENGINE=NDB

                 DEFAULT CHARSET=latin1

                 PARTITION BY KEY (b);