bk commit into 5.1 tree (mskold:1.2393)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 repository of marty. When marty 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.2393 06/05/09 12:06:50 mskold@stripped +4 -0
  Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH

  mysql-test/r/ndb_partition_key.result
    1.17 06/05/09 12:05:58 mskold@stripped +2 -2
    Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH

  mysql-test/t/ndb_partition_key.test
    1.11 06/05/09 12:05:57 mskold@stripped +1 -1
    Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH

  mysql-test/t/ndb_index_unique.test
    1.22 06/05/09 12:05:56 mskold@stripped +3 -3
    Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH

  mysql-test/r/ndb_index_unique.result
    1.24 06/05/09 12:05:56 mskold@stripped +3 -3
    Changed to use new syntax for PRIMARY/UNIQUE KEY USING HASH

# 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:	mskold
# Host:	linux.site
# Root:	/home/marty/MySQL/mysql-5.1-new

--- 1.23/mysql-test/r/ndb_index_unique.result	2006-04-26 15:37:19 +02:00
+++ 1.24/mysql-test/r/ndb_index_unique.result	2006-05-09 12:05:56 +02:00
@@ -99,7 +99,7 @@
 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 @@
 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;

--- 1.21/mysql-test/t/ndb_index_unique.test	2006-04-26 15:37:18 +02:00
+++ 1.22/mysql-test/t/ndb_index_unique.test	2006-05-09 12:05:56 +02:00
@@ -72,7 +72,7 @@
   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 @@
   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 @@
   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);

--- 1.16/mysql-test/r/ndb_partition_key.result	2006-04-16 03:49:05 +02:00
+++ 1.17/mysql-test/r/ndb_partition_key.result	2006-05-09 12:05:58 +02:00
@@ -40,7 +40,7 @@
 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 @@
   `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)

--- 1.10/mysql-test/t/ndb_partition_key.test	2006-04-01 23:31:47 +02:00
+++ 1.11/mysql-test/t/ndb_partition_key.test	2006-05-09 12:05:57 +02:00
@@ -45,7 +45,7 @@
 #
 
 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);