bzr push into mysql-trunk branch (roy.lyseng:3483 to 3484) Bug#13106350

[Roy Lyseng]

 3484 Roy Lyseng	2011-11-10
      Bug#13106350: MRR initialization on a derived table caused crash
      
      Temporary test file modifications that should be reversed when backporting
      is merged to trunk.

    modified:
      mysql-test/r/derived.result
      mysql-test/t/derived.test
 3483 Sergey Glukhov	2011-11-10
      Bug#13358379 EXPLAIN SELECT ... PROCEDURE ANALYZE CRASHES THE SERVER
      Problem: code which is realted to PROCEDURE resultpreparation
               is missing in JOIN::explain().
      Fix:     code which is related to PROCEDURE result preparation
               is moved into JOIN::prepare_result.
     @ mysql-test/r/func_analyse.result
        test case
     @ mysql-test/t/func_analyse.test
        test case
     @ sql/sql_select.cc
        Problem: code which is realted to PROCEDURE result preparation
                 is missing in JOIN::explain().
        Fix:     code which is related to PROCEDURE result preparation
                 is moved into JOIN::prepare_result().

    modified:
      mysql-test/r/func_analyse.result
      mysql-test/t/func_analyse.test
      sql/sql_select.cc
      sql/sql_select.h
=== modified file 'mysql-test/r/derived.result'
--- a/mysql-test/r/derived.result	2011-11-03 14:17:25 +0000
+++ b/mysql-test/r/derived.result	2011-11-10 13:01:02 +0000
@@ -1617,8 +1617,6 @@ DROP TABLE t1, t2;
 #
 # Bug#13106350: MRR initialization on a derived table caused crash.
 #
-SET @save_switch= @@optimizer_switch;
-SET @@optimizer_switch="materialization=off";
 CREATE TABLE t1 (pk INTEGER PRIMARY KEY, vc VARCHAR(20));
 INSERT INTO t1 VALUES(7, 'seven'), (13, 'thirteen');
 CREATE TABLE t2 (pk INTEGER PRIMARY KEY, vc1 VARCHAR(20), vc2 VARCHAR(20));
@@ -1631,9 +1629,9 @@ WHERE derived.vc IN (
 SELECT t2.vc1
 FROM t2 JOIN t3 ON t2.vc2=t3.vc);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	2	Using where; Start temporary
+1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	2	Using where; Start materialize; Scan
+1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	3	Using where; End materialize; Using join buffer (Block Nested Loop)
 1	PRIMARY	<derived2>	ref	auto_key0	auto_key0	23	test.t2.vc1	2	
-1	PRIMARY	t3	ALL	NULL	NULL	NULL	NULL	3	Using where; End temporary; Using join buffer (Block Nested Loop)
 2	DERIVED	t1	ALL	NULL	NULL	NULL	NULL	2	
 SELECT derived.vc
 FROM (SELECT * FROM t1) AS derived
@@ -1642,7 +1640,6 @@ SELECT t2.vc1
 FROM t2 JOIN t3 ON t2.vc2=t3.vc);
 vc
 seven
-SET @@optimizer_switch= @save_switch;
 DROP TABLE t1, t2, t3;
 #
 #

=== modified file 'mysql-test/t/derived.test'
--- a/mysql-test/t/derived.test	2011-11-03 14:17:25 +0000
+++ b/mysql-test/t/derived.test	2011-11-10 13:01:02 +0000
@@ -980,8 +980,9 @@ DROP TABLE t1, t2;
 --echo # Bug#13106350: MRR initialization on a derived table caused crash.
 --echo #
 
-SET @save_switch= @@optimizer_switch;
-SET @@optimizer_switch="materialization=off";
+# IMPORTANT: Enable these switch settings when backporting is merged to trunk
+# SET @save_switch= @@optimizer_switch;
+# SET @@optimizer_switch="materialization=off";
 
 CREATE TABLE t1 (pk INTEGER PRIMARY KEY, vc VARCHAR(20));
 
@@ -1004,7 +1005,7 @@ WHERE derived.vc IN (
 eval explain $query;
 eval $query;
 
-SET @@optimizer_switch= @save_switch;
+# SET @@optimizer_switch= @save_switch;
 
 DROP TABLE t1, t2, t3;
 

No bundle (reason: useless for push emails).