Commit 17472067 authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
parents a4712f9f 4d440ab0

mysql-test/r/ndb_read_multi_range.result

+14 −0
Original line number Diff line number Diff line
@@ -428,3 +428,17 @@ NULL 7 
2005-12-08 15:58:27	1

2006-02-23 15:01:35	1

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_read_multi_range.test

+15 −0
Original line number Diff line number Diff line
@@ -257,3 +257,18 @@ group by c 
order by c;



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



# bug#19956

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');

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



DROP TABLE t1;