bk commit into 4.1 tree (gkodinov:1.2539)

[kgeorge]

Below is the list of changes that have just been committed into a local
4.1 repository of kgeorge. When kgeorge 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-07-26 18:49:26+03:00, gkodinov@rakia.(none) +3 -0
  Merge gkodinov@stripped:/home/bk/mysql-4.1-opt
  into  rakia.(none):/home/kgeorge/mysql/autopush/B21019-4.1-opt
  MERGE: 1.2536.2.1

  mysql-test/r/select.result@stripped, 2006-07-26 18:48:58+03:00, gkodinov@rakia.(none) +0 -0
    SCCS merged
    MERGE: 1.75.1.1

  mysql-test/t/select.test@stripped, 2006-07-26 18:49:19+03:00, gkodinov@rakia.(none) +0 -0
    SCCS merged
    MERGE: 1.58.1.1

  sql/sql_select.cc@stripped, 2006-07-26 18:46:33+03:00, gkodinov@rakia.(none) +0 -0
    Auto merged
    MERGE: 1.460.1.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:	gkodinov
# Host:	rakia.(none)
# Root:	/home/kgeorge/mysql/autopush/B21019-4.1-opt/RESYNC

--- 1.461/sql/sql_select.cc	2006-07-26 18:49:42 +03:00
+++ 1.462/sql/sql_select.cc	2006-07-26 18:49:42 +03:00
@@ -2161,8 +2161,11 @@ merge_key_fields(KEY_FIELD *start,KEY_FI
 	  /* field = expression OR field IS NULL */
 	  old->level= and_level;
 	  old->optimize= KEY_OPTIMIZE_REF_OR_NULL;
-	  /* Remember the NOT NULL value */
-	  if (old->val->is_null())
+	  /*
+            Remember the NOT NULL value unless the value does not depend
+            on other tables.
+          */
+	  if (!old->val->used_tables() && old->val->is_null())
 	    old->val= new_fields->val;
           /* The referred expression can be NULL: */ 
           old->null_rejecting= 0;

--- 1.76/mysql-test/r/select.result	2006-07-26 18:49:42 +03:00
+++ 1.77/mysql-test/r/select.result	2006-07-26 18:49:42 +03:00
@@ -2744,6 +2744,32 @@ SELECT i='1e+01',i=1e+01, i in (1e+01), 
 i='1e+01'	i=1e+01	i in (1e+01)	i in ('1e+01')
 0	1	1	1
 DROP TABLE t1;
+CREATE TABLE t1 (a int, b int);
+INSERT INTO t1 VALUES (1,1), (2,1), (4,10);
+CREATE TABLE t2 (a int PRIMARY KEY, b int, KEY b (b));
+INSERT INTO t2 VALUES (1,NULL), (2,10);
+ALTER TABLE t1 ENABLE KEYS;
+EXPLAIN SELECT STRAIGHT_JOIN SQL_NO_CACHE COUNT(*) FROM t2, t1 WHERE t1.b = t2.b OR t2.b
IS NULL;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	index	b	b	5	NULL	2	Using index
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
+SELECT STRAIGHT_JOIN SQL_NO_CACHE * FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;
+a	b	a	b
+1	NULL	1	1
+1	NULL	2	1
+1	NULL	4	10
+2	10	4	10
+EXPLAIN SELECT STRAIGHT_JOIN SQL_NO_CACHE COUNT(*) FROM t2, t1 WHERE t1.b = t2.b OR t2.b
IS NULL;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	index	b	b	5	NULL	2	Using index
+1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	3	Using where
+SELECT STRAIGHT_JOIN SQL_NO_CACHE * FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;
+a	b	a	b
+1	NULL	1	1
+1	NULL	2	1
+1	NULL	4	10
+2	10	4	10
+DROP TABLE IF EXISTS t1,t2;
 CREATE TABLE t1 (key1 float default NULL, UNIQUE KEY key1 (key1));
 CREATE TABLE t2 (key2 float default NULL, UNIQUE KEY key2 (key2));
 INSERT INTO t1 VALUES (0.3762),(0.3845),(0.6158),(0.7941);

--- 1.59/mysql-test/t/select.test	2006-07-26 18:49:42 +03:00
+++ 1.60/mysql-test/t/select.test	2006-07-26 18:49:42 +03:00
@@ -2298,6 +2298,21 @@ SELECT i='1e+01',i=1e+01, i in (1e+01), 
 DROP TABLE t1;
 
 #
+# Bug #21019: First result of SELECT COUNT(*) different than consecutive runs
+#
+CREATE TABLE t1 (a int, b int);
+INSERT INTO t1 VALUES (1,1), (2,1), (4,10);
+
+CREATE TABLE t2 (a int PRIMARY KEY, b int, KEY b (b));
+INSERT INTO t2 VALUES (1,NULL), (2,10);
+ALTER TABLE t1 ENABLE KEYS;
+
+EXPLAIN SELECT STRAIGHT_JOIN SQL_NO_CACHE COUNT(*) FROM t2, t1 WHERE t1.b = t2.b OR t2.b
IS NULL;
+SELECT STRAIGHT_JOIN SQL_NO_CACHE * FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;
+EXPLAIN SELECT STRAIGHT_JOIN SQL_NO_CACHE COUNT(*) FROM t2, t1 WHERE t1.b = t2.b OR t2.b
IS NULL;
+SELECT STRAIGHT_JOIN SQL_NO_CACHE * FROM t2, t1 WHERE t1.b = t2.b OR t2.b IS NULL;
+DROP TABLE IF EXISTS t1,t2;
+#
 # Bug #20954 "avg(keyval) retuns 0.38 but max(keyval) returns an empty set"
 #
 --disable_ps_protocol