Commit a99bc695 authored by Gleb Shchepa's avatar Gleb Shchepa
Browse files

manual merge 5.0-bugteam --> 5.1-bugteam

parents fe3aee30 27f4c34b

mysql-test/r/subselect3.result

+16 −0
Original line number Diff line number Diff line
@@ -779,6 +779,22 @@ SELECT 1 FROM t1 WHERE t1.a NOT IN (SELECT 1 FROM t1, t2 WHERE 0); 
1

1

DROP TABLE t1, t2;

CREATE TABLE t1 (

pk INT PRIMARY KEY,

int_key INT,

varchar_key VARCHAR(5) UNIQUE,

varchar_nokey VARCHAR(5)

);

INSERT INTO t1 VALUES (9, 7,NULL,NULL), (10,8,'p' ,'p');

SELECT varchar_nokey

FROM t1

WHERE NULL NOT IN (

SELECT INNR.pk FROM t1 AS INNR2

LEFT JOIN t1 AS INNR ON ( INNR2.int_key = INNR.int_key )

WHERE INNR.varchar_key > 'n{'

);

varchar_nokey

DROP TABLE t1;

End of 5.0 tests

create table t0 (a int);

insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);

mysql-test/t/subselect3.test

+22 −0
Original line number Diff line number Diff line
@@ -618,6 +618,28 @@ SELECT 1 FROM t1 WHERE t1.a NOT IN (SELECT 1 FROM t1, t2 WHERE 0); 


DROP TABLE t1, t2;



#

# Bug #37894: Assertion in init_read_record_seq in handler.h line 1444

#



CREATE TABLE t1 (

  pk INT PRIMARY KEY,

  int_key INT,

  varchar_key VARCHAR(5) UNIQUE,

  varchar_nokey VARCHAR(5)

);

INSERT INTO t1 VALUES (9, 7,NULL,NULL), (10,8,'p' ,'p');



SELECT varchar_nokey

FROM t1

WHERE NULL NOT IN (

 SELECT INNR.pk FROM t1 AS INNR2

   LEFT JOIN t1 AS INNR ON ( INNR2.int_key = INNR.int_key )

   WHERE INNR.varchar_key > 'n{'

);



DROP TABLE t1;



--echo End of 5.0 tests



#

sql/opt_range.cc

+1 −1
Original line number Diff line number Diff line
@@ -1151,7 +1151,7 @@ int QUICK_RANGE_SELECT::init() 


  if (file->inited != handler::NONE)

    file->ha_index_or_rnd_end();

  DBUG_RETURN(error= file->ha_index_init(index, 1));

  DBUG_RETURN(FALSE);

}