Commit 79dde782 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.0-ndb
parents a881afd1 817ed402

mysql-test/r/ndb_index_ordered.result

+3 −4
Original line number Diff line number Diff line
@@ -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)

mysql-test/t/ndb_index_ordered.test

+3 −5
Original line number Diff line number Diff line
@@ -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;