Commit dadda87f authored by unknown's avatar unknown
Browse files

Merge rurik.mysql.com:/home/igor/mysql-5.0 

into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


sql/opt_range.cc:
  Auto merged
parents a91620ae c4a8325d

mysql-test/r/subselect.result

+21 −0
Original line number Diff line number Diff line
@@ -2816,3 +2816,24 @@ select * from t1; 
EMPNUM

E1

DROP TABLE t1,t2;

CREATE TABLE t1(select_id BIGINT, values_id BIGINT);

INSERT INTO t1 VALUES (1, 1);

CREATE TABLE t2 (select_id BIGINT, values_id BIGINT, 

PRIMARY KEY(select_id,values_id));

INSERT INTO t2 VALUES (0, 1), (0, 2), (0, 3), (1, 5);

SELECT values_id FROM t1 

WHERE values_id IN (SELECT values_id FROM t2

WHERE select_id IN (1, 0));

values_id

1

SELECT values_id FROM t1 

WHERE values_id IN (SELECT values_id FROM t2

WHERE select_id BETWEEN 0 AND 1);

values_id

1

SELECT values_id FROM t1 

WHERE values_id IN (SELECT values_id FROM t2

WHERE select_id = 0 OR select_id = 1);

values_id

1

DROP TABLE t1, t2;

mysql-test/t/subselect.test

+22 −0
Original line number Diff line number Diff line
@@ -1837,3 +1837,25 @@ WHERE t1.EMPNUM NOT IN 
       WHERE t1.EMPNUM = t2.EMPNUM);

select * from t1;

DROP TABLE t1,t2;



#

# Test for bug #11487: range access in a subquery

#



CREATE TABLE t1(select_id BIGINT, values_id BIGINT);

INSERT INTO t1 VALUES (1, 1);

CREATE TABLE t2 (select_id BIGINT, values_id BIGINT, 

                 PRIMARY KEY(select_id,values_id));

INSERT INTO t2 VALUES (0, 1), (0, 2), (0, 3), (1, 5);



SELECT values_id FROM t1 

WHERE values_id IN (SELECT values_id FROM t2

                    WHERE select_id IN (1, 0));

SELECT values_id FROM t1 

WHERE values_id IN (SELECT values_id FROM t2

                    WHERE select_id BETWEEN 0 AND 1);

SELECT values_id FROM t1 

WHERE values_id IN (SELECT values_id FROM t2

                    WHERE select_id = 0 OR select_id = 1);



DROP TABLE t1, t2;

sql/opt_range.cc

+4 −1
Original line number Diff line number Diff line
@@ -5993,6 +5993,9 @@ int QUICK_RANGE_SELECT::reset() 
  range= NULL;

  cur_range= (QUICK_RANGE**) ranges.buffer;



  if (file->inited == handler::NONE && (error= file->ha_index_init(index)))

      DBUG_RETURN(error);

 

  /* Do not allocate the buffers twice. */

  if (multi_range_length)

  {