bzr commit into mysql-5.1-bugteam branch (martin.hansson:3408) Bug#47762

[Martin Hansson]

#At file:///data0/martin/bzr/bug47762/5.1bt-post_push/ based on revid:omer@stripped

 3408 Martin Hansson	2010-03-18
      Post-push fix to disable a subset of the test case for Bug#47762.
      This has been back-ported from 6.0 as the problems proved to afflict 
      5.1 as well.
      The fix exposed two new bugs. They were reported as follows.
            
      Bug no 52174: Sometimes wrong plan when reading a MAX value 
      from non-NULL index
            
      Bug no 52173: Reading NULL value from non-NULL index gives wrong 
      result in embedded server 
            
      Both bugs taken together affect a much smaller class of queries than #47762, 
      so the fix stays for now.

    modified:
      mysql-test/include/min_null_cond.inc
      mysql-test/r/group_min_max.result
      mysql-test/t/group_min_max.test
=== modified file 'mysql-test/include/min_null_cond.inc'
--- a/mysql-test/include/min_null_cond.inc	2010-03-16 14:51:00 +0000
+++ b/mysql-test/include/min_null_cond.inc	2010-03-18 15:56:19 +0000
@@ -18,11 +18,13 @@ EXPLAIN
 SELECT MIN( a ) FROM t1 WHERE a < NULL;
 SELECT MIN( a ) FROM t1 WHERE a < NULL;
 
+if (!$skip_null_safe_test)
+{
 --replace_column 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x
 EXPLAIN
 SELECT MIN( a ) FROM t1 WHERE a <=> NULL;
 SELECT MIN( a ) FROM t1 WHERE a <=> NULL;
-
+}
 --replace_column 1 x 2 x 3 x 4 x 5 x 6 x 7 x 8 x 9 x
 EXPLAIN
 SELECT MIN( a ) FROM t1 WHERE a BETWEEN NULL AND 10;

=== modified file 'mysql-test/r/group_min_max.result'
--- a/mysql-test/r/group_min_max.result	2010-03-16 14:51:00 +0000
+++ b/mysql-test/r/group_min_max.result	2010-03-18 15:56:19 +0000
@@ -2720,13 +2720,6 @@ SELECT MIN( a ) FROM t1 WHERE a < NULL;
 MIN( a )
 NULL
 EXPLAIN
-SELECT MIN( a ) FROM t1 WHERE a <=> NULL;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-x	x	x	x	x	x	x	x	x	No matching min/max row
-SELECT MIN( a ) FROM t1 WHERE a <=> NULL;
-MIN( a )
-NULL
-EXPLAIN
 SELECT MIN( a ) FROM t1 WHERE a BETWEEN NULL AND 10;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 x	x	x	x	x	x	x	x	x	Impossible WHERE noticed after reading const tables

=== modified file 'mysql-test/t/group_min_max.test'
--- a/mysql-test/t/group_min_max.test	2010-03-16 14:51:00 +0000
+++ b/mysql-test/t/group_min_max.test	2010-03-18 15:56:19 +0000
@@ -1070,6 +1070,7 @@ DROP TABLE t1;
 --echo ## Test for NOT NULLs
 CREATE TABLE t1 ( a INT NOT NULL PRIMARY KEY);
 INSERT INTO t1 VALUES (1), (2), (3);
+--let $skip_null_safe_test= 1
 --source include/min_null_cond.inc
 DROP TABLE t1;
 


Attachment: [text/bzr-bundle] bzr/[e-mail]