bk commit into 5.1 tree (mskold:1.2385) BUG#24820

[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@stripped, 2007-01-08 14:20:35+01:00, mskold@stripped +2 -0
  bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH
index: Merged up test 5.0 case

  mysql-test/r/ndb_index_ordered.result@stripped, 2007-01-08 14:20:16+01:00, mskold@stripped
+8 -0
    bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH
index: Merged up test 5.0 case

  mysql-test/t/ndb_index_ordered.test@stripped, 2007-01-08 14:20:16+01:00, mskold@stripped +9
-0
    bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH
index: Merged up test 5.0 case

# 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:	/windows/Linux_space/MySQL/mysql-5.1-new-ndb

--- 1.28/mysql-test/r/ndb_index_ordered.result	2007-01-08 14:20:43 +01:00
+++ 1.29/mysql-test/r/ndb_index_ordered.result	2007-01-08 14:20:43 +01:00
@@ -839,6 +839,14 @@ create table nationaldish (DishID int(10
 CountryCode char(3) NOT NULL,
 DishTitle varchar(64) NOT NULL,
 calories smallint(5) unsigned DEFAULT NULL,
+PRIMARY KEY (DishID),
+INDEX i USING HASH (countrycode,calories)
+) ENGINE=ndbcluster;
+ERROR HY000: Can't create table 'test.nationaldish' (errno: 138)
+create table nationaldish (DishID int(10) unsigned NOT NULL AUTO_INCREMENT,
+CountryCode char(3) NOT NULL,
+DishTitle varchar(64) NOT NULL,
+calories smallint(5) unsigned DEFAULT NULL,
 PRIMARY KEY (DishID)
 ) ENGINE=ndbcluster;
 create index i on nationaldish(countrycode,calories) using hash;

--- 1.31/mysql-test/t/ndb_index_ordered.test	2007-01-08 14:20:43 +01:00
+++ 1.32/mysql-test/t/ndb_index_ordered.test	2007-01-08 14:20:43 +01:00
@@ -458,6 +458,15 @@ drop table t1;
 
 # bug#24820 CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH
index
 
+--error ER_CANT_CREATE_TABLE
+create table nationaldish (DishID int(10) unsigned NOT NULL AUTO_INCREMENT,
+                           CountryCode char(3) NOT NULL,
+                           DishTitle varchar(64) NOT NULL,
+                           calories smallint(5) unsigned DEFAULT NULL,
+                           PRIMARY KEY (DishID),
+                           INDEX i USING HASH (countrycode,calories)
+                           ) ENGINE=ndbcluster;
+
 create table nationaldish (DishID int(10) unsigned NOT NULL AUTO_INCREMENT,
                            CountryCode char(3) NOT NULL,
                            DishTitle varchar(64) NOT NULL,