bk commit into 5.1 tree (mskold:1.2348)

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.1 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, 2006-12-15 09:06:15+01:00, mskold@stripped +2 -0
  Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0
  into  mysql.com:/windows/Linux_space/MySQL/mysql-5.1
  MERGE: 1.1810.2348.7

  mysql-test/r/ndb_read_multi_range.result@stripped, 2006-12-15 09:06:09+01:00,
mskold@stripped +0 -0
    Auto merged
    MERGE: 1.3.2.1

  mysql-test/t/ndb_read_multi_range.test@stripped, 2006-12-15 09:06:09+01:00,
mskold@stripped +0 -0
    Auto merged
    MERGE: 1.4.2.1

# 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.1/RESYNC

--- 1.8/mysql-test/r/ndb_read_multi_range.result	2006-12-15 09:06:24 +01:00
+++ 1.9/mysql-test/r/ndb_read_multi_range.result	2006-12-15 09:06:25 +01:00
@@ -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;

--- 1.10/mysql-test/t/ndb_read_multi_range.test	2006-12-15 09:06:25 +01:00
+++ 1.11/mysql-test/t/ndb_read_multi_range.test	2006-12-15 09:06:25 +01:00
@@ -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;