Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb

2 files changed, 6 insertions, 9 deletions

diff --git a/mysql-test/r/ndb_index_ordered.result b/mysql-test/r/ndb_index_ordered.result
index 54458e1b459..b3e55a23073 100644
--- a/mysql-test/r/ndb_index_ordered.result
+++ b/mysql-test/r/ndb_index_ordered.result
@@ -662,8 +662,7 @@ 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;
-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)
diff --git a/mysql-test/t/ndb_index_ordered.test b/mysql-test/t/ndb_index_ordered.test
index fa76202c7b7..5867140fabb 100644
--- a/mysql-test/t/ndb_index_ordered.test
+++ b/mysql-test/t/ndb_index_ordered.test
@@ -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;