bk commit into 5.0 tree (mskold:1.2203) BUG#21059

[Martin Skold]

Below is the list of changes that have just been committed into a local
5.0 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-08-09 14:32:56+02:00, mskold@stripped +2 -0
  Fix for bug #21059  Server crashes on join query with large dataset with NDB tables:
added more tests

  mysql-test/r/ndb_read_multi_range.result@stripped, 2006-08-09 14:32:14+02:00,
mskold@stripped +64 -3
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables:
added more tests

  mysql-test/t/ndb_read_multi_range.test@stripped, 2006-08-09 14:32:14+02:00, mskold@stripped
+22 -3
    Fix for bug #21059  Server crashes on join query with large dataset with NDB tables:
added more tests

# 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:	/home/marty/MySQL/mysql-5.0

--- 1.5/mysql-test/r/ndb_read_multi_range.result	2006-08-09 14:33:04 +02:00
+++ 1.6/mysql-test/r/ndb_read_multi_range.result	2006-08-09 14:33:04 +02:00
@@ -286,10 +286,10 @@ INSERT INTO t1 VALUES 
 (406990,67,'2006-02-23 18:01:45'),(148815,67,'2005-10-25 15:34:17'),
 (148812,67,'2005-10-25 15:30:01'),(245651,67,'2005-12-08 15:58:27'),
 (154503,67,'2005-10-28 11:52:38');
-create table t11 select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3
asc;
-create table t12 select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3
desc;
+create table t11 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c
> NOW()) order by 3 asc;
+create table t12 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c
> NOW()) order by 3 desc;
 create table t21 select * from t1 where b = 67 AND (c IS NULL OR c > '2005-12-08')
order by 3 asc;
-create table t22 select * from t1 where b = 67 AND (c IS NULL OR c > '2005-12-08')
order by 3 desc;
+create table t22 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c
> '2005-12-08') order by 3 desc;
 select * from t11 order by 1,2,3;
 a	b	c
 254	67	NULL
@@ -366,4 +366,65 @@ a	b	c
 406993	67	2006-02-27 11:20:57
 406994	67	2006-02-27 11:26:46
 406995	67	2006-02-28 11:55:00
+select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a and t11.c is null
order by t12.a;
+a
+255
+256
+update t22 set c = '2005-12-08 15:58:27' where a = 255;
+select * from t22 order by 1,2,3;
+a	b	c
[phone]:01:35
+254	67	NULL
[phone]:58:27
+256	67	NULL
+1120	67	NULL
+1133	67	NULL
+4101	67	NULL
+9199	67	NULL
[phone]	NULL
[phone]-08 15:58:27
[phone]-08 15:58:27
[phone]-08 15:59:07
[phone]-08 15:59:08
[phone]-08 15:59:08
[phone]-20 04:38:53
[phone]-20 04:48:44
[phone]-20 04:53:13
[phone]-23 10:49:42
[phone]-23 17:07:22
[phone]-23 17:08:46
[phone]-23 18:01:45
[phone]-24 16:42:32
[phone]-24 16:47:18
[phone]-27 11:20:57
[phone]-27 11:26:46
[phone]-28 11:55:00
+select t21.* from t21,t22 where t21.a = t22.a and 
+t22.a in (select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a and t11.c
is null) and t22.c is null order by t21.a;
+a	b	c
+256	67	NULL
+delete from t22 where a > 245651;
+update t22 set b = a + 1;
+select * from t22 order by 1,2,3;
+a	b	c
[phone]:01:35
+254	255	NULL
[phone] 15:58:27
+256	257	NULL
[phone]	NULL
[phone]	NULL
[phone]	NULL
[phone]	NULL
[phone]	NULL
[phone]	2005-12-08 15:58:27
+select c, count(*)
+from t21 
+inner join t22 using (a)
+where t22.b in (2,256,257,1121,1134,4102,9200,223457,245652)
+group by c
+order by c;
+c	count(*)
+NULL	7
[phone]:58:27	1
[phone]:01:35	1
 DROP TABLE t1, t11, t12, t21, t22;

--- 1.6/mysql-test/t/ndb_read_multi_range.test	2006-08-09 14:33:04 +02:00
+++ 1.7/mysql-test/t/ndb_read_multi_range.test	2006-08-09 14:33:04 +02:00
@@ -228,13 +228,32 @@ INSERT INTO t1 VALUES 
 (148812,67,'2005-10-25 15:30:01'),(245651,67,'2005-12-08 15:58:27'),
 (154503,67,'2005-10-28 11:52:38');
 
-create table t11 select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3
asc;
-create table t12 select * from t1 where b = 67 AND (c IS NULL OR c > NOW()) order by 3
desc;
+create table t11 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c
> NOW()) order by 3 asc;
+create table t12 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c
> NOW()) order by 3 desc;
 create table t21 select * from t1 where b = 67 AND (c IS NULL OR c > '2005-12-08')
order by 3 asc;
-create table t22 select * from t1 where b = 67 AND (c IS NULL OR c > '2005-12-08')
order by 3 desc;
+create table t22 engine = ndbcluster select * from t1 where b = 67 AND (c IS NULL OR c
> '2005-12-08') order by 3 desc;
 
 select * from t11 order by 1,2,3;
 select * from t12 order by 1,2,3;
 select * from t21 order by 1,2,3;
 select * from t22 order by 1,2,3;
+
+# join tests
+select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a and t11.c is null
order by t12.a;
+
+update t22 set c = '2005-12-08 15:58:27' where a = 255;
+select * from t22 order by 1,2,3;
+select t21.* from t21,t22 where t21.a = t22.a and 
+t22.a in (select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a and t11.c
is null) and t22.c is null order by t21.a;
+
+delete from t22 where a > 245651;
+update t22 set b = a + 1;
+select * from t22 order by 1,2,3;
+select c, count(*)
+from t21 
+inner join t22 using (a)
+where t22.b in (2,256,257,1121,1134,4102,9200,223457,245652)
+group by c
+order by c;
+
 DROP TABLE t1, t11, t12, t21, t22;