mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
manual merge 5.0-bugteam --> 5.1-bugteam
This commit is contained in:
@ -779,6 +779,22 @@ SELECT 1 FROM t1 WHERE t1.a NOT IN (SELECT 1 FROM t1, t2 WHERE 0);
|
|||||||
1
|
1
|
||||||
1
|
1
|
||||||
DROP TABLE t1, t2;
|
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
|
End of 5.0 tests
|
||||||
create table t0 (a int);
|
create table t0 (a int);
|
||||||
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
|
insert into t0 values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
|
||||||
|
@ -618,6 +618,28 @@ SELECT 1 FROM t1 WHERE t1.a NOT IN (SELECT 1 FROM t1, t2 WHERE 0);
|
|||||||
|
|
||||||
DROP TABLE t1, t2;
|
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
|
--echo End of 5.0 tests
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -1151,7 +1151,7 @@ int QUICK_RANGE_SELECT::init()
|
|||||||
|
|
||||||
if (file->inited != handler::NONE)
|
if (file->inited != handler::NONE)
|
||||||
file->ha_index_or_rnd_end();
|
file->ha_index_or_rnd_end();
|
||||||
DBUG_RETURN(error= file->ha_index_init(index, 1));
|
DBUG_RETURN(FALSE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user