bk commit into 5.1 tree (mskold:1.2427) BUG#25821

[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, 2007-02-07 09:49:16+01:00, mskold@stripped +2 -0
  bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added
original test case

  mysql-test/r/ndb_read_multi_range.result@stripped, 2007-02-07 09:49:01+01:00,
mskold@stripped +10 -3
    bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added
original test case

  mysql-test/t/ndb_read_multi_range.test@stripped, 2007-02-07 09:49:01+01:00, mskold@stripped
+10 -3
    bug#25821  Excessive partition pruning for multi-range index scan in NDB API: added
original test case

# 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-new-ndb

--- 1.12/mysql-test/r/ndb_read_multi_range.result	2007-02-07 09:49:25 +01:00
+++ 1.13/mysql-test/r/ndb_read_multi_range.result	2007-02-07 09:49:25 +01:00
@@ -459,10 +459,17 @@ INSERT INTO t1 VALUES (1,1),(2,2),(3,3);
 UPDATE t1 SET var2 = 9 WHERE var1 IN(1,2,3);
 DROP TRIGGER testtrigger;
 DROP TABLE t1, t2;
-create table t2 (a int, b int, primary key (a), key ab (a,b)) engine=ndbcluster;
+create table t1 (a int, b int, primary key (a), key ab (a,b)) engine=ndbcluster;
+insert into t1 values (1,1), (10,10);
+select * from t1 use index (ab) where a in(1,10) order by a;
+a	b
+1	1
+10	10
+create table t2 (a int, b int, primary key (a,b)) engine=ndbcluster
+partition by key(a);
 insert into t2 values (1,1), (10,10);
-select * from t2 use index (ab) where a in(1,10) order by a;
+select * from t2 where a in (1,10) order by a;
 a	b
 1	1
 10	10
-drop table t2;
+drop table t1, t2;

--- 1.14/mysql-test/t/ndb_read_multi_range.test	2007-02-07 09:49:25 +01:00
+++ 1.15/mysql-test/t/ndb_read_multi_range.test	2007-02-07 09:49:25 +01:00
@@ -303,10 +303,17 @@ DROP TRIGGER testtrigger;
 DROP TABLE t1, t2;
 
 #bug#25821
-create table t2 (a int, b int, primary key (a), key ab (a,b)) engine=ndbcluster;
+create table t1 (a int, b int, primary key (a), key ab (a,b)) engine=ndbcluster;
+
+insert into t1 values (1,1), (10,10);
+
+select * from t1 use index (ab) where a in(1,10) order by a;
+
+create table t2 (a int, b int, primary key (a,b)) engine=ndbcluster
+partition by key(a);
 
 insert into t2 values (1,1), (10,10);
 
-select * from t2 use index (ab) where a in(1,10) order by a;
+select * from t2 where a in (1,10) order by a;
 
-drop table t2;
+drop table t1, t2;