summaryrefslogtreecommitdiff
path: root/mysql-test/r/null_key.result
diff options
context:
space:
mode:
authorunknown <sergefp@mysql.com>2008-03-03 20:35:44 +0300
committerunknown <sergefp@mysql.com>2008-03-03 20:35:44 +0300
commitcd9f2d1c285d1bc5f5115e517da806ccb2bd1d28 (patch)
tree2a14a7b3a838192c9191d0591e5a4a88d17d963f /mysql-test/r/null_key.result
parent2cb35cd680d70f3e1e26b5672f2125d6fdff4921 (diff)
downloadmariadb-git-cd9f2d1c285d1bc5f5115e517da806ccb2bd1d28.tar.gz
BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql"
- Apply Eric Bergen's patch: in join_read_always_key(), move ha_index_init() call to before the late NULLs filtering code. - Backport function comments from 6.0. mysql-test/r/null_key.result: BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql" - Testcase mysql-test/t/null_key.test: BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql" - Testcase sql/sql_select.cc: BUG#34945: "ref_or_null queries that are null_rejecting and have a null value crash mysql" - Apply Eric Bergen's patch: in join_read_always_key(), move ha_index_init() call to before the late NULLs filtering code. - Backport function comments from 6.0
Diffstat (limited to 'mysql-test/r/null_key.result')
-rw-r--r--mysql-test/r/null_key.result18
1 files changed, 18 insertions, 0 deletions
diff --git a/mysql-test/r/null_key.result b/mysql-test/r/null_key.result
index 8a440284c53..58c587fe588 100644
--- a/mysql-test/r/null_key.result
+++ b/mysql-test/r/null_key.result
@@ -429,3 +429,21 @@ Handler_read_prev 0
Handler_read_rnd 0
Handler_read_rnd_next 5
DROP TABLE t1,t2,t3,t4;
+CREATE TABLE t1 (
+a int(11) default NULL,
+b int(11) default NULL,
+KEY a (a,b)
+);
+INSERT INTO t1 VALUES (0,10),(0,11),(0,12);
+CREATE TABLE t2 (
+a int(11) default NULL,
+b int(11) default NULL,
+KEY a (a)
+);
+INSERT INTO t2 VALUES (3,NULL),(3,11),(3,12);
+SELECT * FROM t2 inner join t1 WHERE ( t1.a = 0 OR t1.a IS NULL) AND t2.a = 3 AND t2.b = t1.b;
+a b a b
+3 11 0 11
+3 12 0 12
+drop table t1, t2;
+End of 5.0 tests