Commit 048fbb84 authored by unknown's avatar unknown
Browse files

Merge macbook.gmz:/Users/kgeorge/mysql/work/B21019-4.1-opt 

into  macbook.gmz:/Users/kgeorge/mysql/work/B21019-5.0-opt


mysql-test/t/select.test:
  Auto merged
sql/sql_select.cc:
  Auto merged
mysql-test/r/select.result:
  SCCS merged
parents 38091170 5ca1ee5e

mysql-test/r/select.result

+26 −0
Original line number Diff line number Diff line
@@ -3125,6 +3125,32 @@ select count(*) 
from t1 inner join (t2 right join t3 on t2.id = t3.b_id) on t1.id = t3.a_id;

count(*)

6

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;

drop table t1,t2,t3;

create table t1 (a int);

create table t2 (b int);

mysql-test/t/select.test

+15 −0
Original line number Diff line number Diff line
@@ -2304,6 +2304,21 @@ INSERT INTO t1 VALUES (10); 
SELECT i='1e+01',i=1e+01, i in (1e+01,1e+01), i in ('1e+01','1e+01') FROM t1;

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;

# End of 4.1 tests



#

sql/sql_select.cc

+5 −2
Original line number Diff line number Diff line
@@ -2490,8 +2490,11 @@ merge_key_fields(KEY_FIELD *start,KEY_FIELD *new_fields,KEY_FIELD *end, 
	  /* 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;