From: Date: January 8 2007 1:53pm
Subject: bk commit into 5.0 tree (mskold:1.2294) BUG#24820
List-Archive: http://lists.mysql.com/commits/17726
X-Bug: 24820
Message-Id: <20070108125350.5FD01220AAA@linux.site>

Below is the list of changes that have just been committed into a local
5.0 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 13:53:37+01:00, mskold@stripped +2 -0
  bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Changed test since error mesage wasn't predictable

  mysql-test/r/ndb_index_ordered.result@stripped, 2007-01-08 13:53:05+01:00, mskold@stripped +3 -4
    bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Changed test since error mesage wasn't predictable

  mysql-test/t/ndb_index_ordered.test@stripped, 2007-01-08 13:53:05+01:00, mskold@stripped +3 -5
    bug#24820  CREATE INDEX ....USING HASH on NDB table creates ordered index, not HASH index: Changed test since error mesage wasn't predictable

# 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.0

--- 1.23/mysql-test/r/ndb_index_ordered.result	2007-01-08 13:53:50 +01:00
+++ 1.24/mysql-test/r/ndb_index_ordered.result	2007-01-08 13:53:50 +01:00
@@ -662,8 +662,7 @@ 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)
+PRIMARY KEY (DishID),
+INDEX i USING HASH (countrycode,calories)
 ) ENGINE=ndbcluster;
-create index i using hash on nationaldish(countrycode,calories);
-ERROR HY000: Can't create table './test/#sql-3c51_2.frm' (errno: 138)
-drop table nationaldish;
+ERROR HY000: Can't create table './test/nationaldish.frm' (errno: 138)

--- 1.26/mysql-test/t/ndb_index_ordered.test	2007-01-08 13:53:50 +01:00
+++ 1.27/mysql-test/t/ndb_index_ordered.test	2007-01-08 13:53:50 +01:00
@@ -359,14 +359,12 @@ select count(*) from t1 where c<'bbb';
 
 # 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)
+                           PRIMARY KEY (DishID),
+                           INDEX i USING HASH (countrycode,calories)
                            ) ENGINE=ndbcluster;
 
---error ER_CANT_CREATE_TABLE
-create index i using hash on nationaldish(countrycode,calories);
-
-drop table nationaldish;