Commit bb5dccf2 authored by unknown's avatar unknown
Browse files

Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0 

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work


sql/ha_ndbcluster.cc:
  Auto merged
parents 442c1f87 3f064efb

mysql-test/r/ndb_basic.result

+16 −0
Original line number Diff line number Diff line
@@ -749,3 +749,19 @@ f1 f2 f3 
222222	bbbbbb	2

drop table t1;

Illegal ndb error code: 1186

CREATE TABLE t1 (

a VARBINARY(40) NOT NULL,

b VARCHAR (256) CHARACTER SET UTF8 NOT NULL,

c VARCHAR(256) CHARACTER SET UTF8 NOT NULL,

PRIMARY KEY (b,c))  ENGINE=ndbcluster;

INSERT INTO t1 VALUES

("a","ab","abc"),("b","abc","abcd"),("c","abc","ab"),("d","ab","ab"),("e","abc","abc");

SELECT * FROM t1 ORDER BY a;

a	b	c

a	ab	abc

b	abc	abcd

c	abc	ab

d	ab	ab

e	abc	abc

DROP TABLE t1;

End of 5.0 tests

mysql-test/r/ndb_index_ordered.result

+8 −0
Original line number Diff line number Diff line
@@ -658,3 +658,11 @@ insert into t1 (a, c) values (1,'aaa'),(3,'bbb'); 
select count(*) from t1 where c<'bbb';

count(*)

1

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;

ERROR HY000: Can't create table './test/nationaldish.frm' (errno: 138)

mysql-test/r/ndb_read_multi_range.result

+14 −0
Original line number Diff line number Diff line
@@ -367,3 +367,17 @@ a b c 
406994	67	2006-02-27 11:26:46

406995	67	2006-02-28 11:55:00

DROP TABLE t1, t11, t12, t21, t22;

CREATE TABLE t1 (id varchar(255) NOT NULL,

tag int(11) NOT NULL,

doc text NOT NULL,

type varchar(150) NOT NULL,

modified timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,

PRIMARY KEY (id)

) ENGINE=ndbcluster;

INSERT INTO t1 VALUES ('sakila',1,'Some text goes here','text',CURRENT_TIMESTAMP);

SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','orka');

id	tag	doc	type

SELECT id, tag, doc, type FROM t1 WHERE id IN ('flipper','sakila');

id	tag	doc	type

sakila	1	Some text goes here	text

DROP TABLE t1;

mysql-test/t/ndb_basic.test

+19 −0
Original line number Diff line number Diff line
@@ -710,3 +710,22 @@ drop table t1; 
--error 1

--exec $MY_PERROR --ndb 1186 2>&1



#

# Bug #25746 - VARCHAR UTF8 PK issue

# - prior to bugfix 4209, illegal length parameter would be 

# returned in SELECT *



CREATE TABLE t1 (

a VARBINARY(40) NOT NULL,

b VARCHAR (256) CHARACTER SET UTF8 NOT NULL,

c VARCHAR(256) CHARACTER SET UTF8 NOT NULL,

PRIMARY KEY (b,c))  ENGINE=ndbcluster;

INSERT INTO t1 VALUES

("a","ab","abc"),("b","abc","abcd"),("c","abc","ab"),("d","ab","ab"),("e","abc","abc");

SELECT * FROM t1 ORDER BY a;

DROP TABLE t1;



# End of 5.0 tests

--echo End of 5.0 tests

mysql-test/t/ndb_index_ordered.test

+12 −0
Original line number Diff line number Diff line
@@ -356,3 +356,15 @@ insert into t1 (a, c) values (1,'aaa'),(3,'bbb'); 
select count(*) from t1 where c<'bbb';



# End of 4.1 tests



# 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;