bzr push into mysql-next-mr-bugfixing branch (oystein.grovlen:3122 to 3123)

[Oystein.Grovlen]

 3123 oystein.grovlen@stripped	2010-05-03
      Fix failures on mysql-next-mr-opt-backporting by changing the offending lines
      in result files so that they are identical to 6.0 branch.  (This should be 
      the end goal anyway.)
     @ mysql-test/r/subselect3_jcl6.result
        The changed lines are now identical to 6.0-branch
        
        Note that the changed query result is not correct, but this will be fixed in
        Bug#51018.
     @ mysql-test/r/subselect_mat.result
        The changed lines are now identical to 6.0-branch
     @ mysql-test/r/subselect_sj.result
        The changed lines are now identical to 6.0-branch

    modified:
      mysql-test/r/subselect3_jcl6.result
      mysql-test/r/subselect_mat.result
      mysql-test/r/subselect_sj.result
 3122 Evgeny Potemkin	2010-05-02 [merge]
      merge.

    added:
      sql/sql_cmd.h
    modified:
      mysql-test/r/explain.result
      mysql-test/r/func_group.result
      mysql-test/r/innodb_mysql.result
      mysql-test/r/subselect3.result
      mysql-test/r/subselect4.result
      mysql-test/r/subselect_mat.result
      mysql-test/r/subselect_sj.result
      mysql-test/r/subselect_sj2.result
      mysql-test/r/subselect_sj2_jcl6.result
      mysql-test/r/subselect_sj_jcl6.result
      mysql-test/t/explain.test
      mysql-test/t/func_group.test
      mysql-test/t/innodb_mysql.test
      mysql-test/t/subselect.test
      mysql-test/t/subselect4.test
      mysql-test/t/subselect_mat.test
      mysql-test/t/subselect_sj.test
      mysql-test/t/subselect_sj2.test
      sql/Makefile.am
      sql/item.cc
      sql/item.h
      sql/item_subselect.cc
      sql/item_subselect.h
      sql/sql_class.h
      sql/sql_error.cc
      sql/sql_error.h
      sql/sql_lex.cc
      sql/sql_lex.h
      sql/sql_parse.cc
      sql/sql_select.cc
      sql/sql_signal.cc
      sql/sql_signal.h
      sql/sql_yacc.yy
      sql/structs.h
      sql/table.cc
=== modified file 'mysql-test/r/subselect3_jcl6.result'
--- a/mysql-test/r/subselect3_jcl6.result	2010-05-02 18:01:00 +0000
+++ b/mysql-test/r/subselect3_jcl6.result	2010-05-03 12:19:23 +0000
@@ -877,9 +877,6 @@ Level	Code	Message
 Note	1276	Field or reference 'test.t1.a' of SELECT #3 was resolved in SELECT #2
 Note	1276	Field or reference 'test.t1.c' of SELECT #3 was resolved in SELECT #2
 Error	1054	Unknown column 'c' in 'field list'
-Note	1003	select `c` AS `c` from (select (select count(`test`.`t1`.`a`) AS `COUNT(a)` from dual group by `c`) AS `(SELECT COUNT(a) FROM 
-(SELECT COUNT(b) FROM t1) AS x GROUP BY c
-)` from `test`.`t1` group by `test`.`t1`.`b`) `y`
 DROP TABLE t1;
 End of 5.0 tests
 create table t0 (a int);
@@ -1073,6 +1070,7 @@ select t21.* from t21,t22 where t21.a = 
 t22.a in (select t12.a from t11, t12 where t11.a in(255,256) and t11.a = t12.a and t11.c is null) and t22.c is null order by t21.a;
 a	b	c
 256	67	NULL
+256	67	NULL
 drop table t1, t11, t12, t21, t22;
 create table t1(a int);
 insert into t1 values (0),(1);

=== modified file 'mysql-test/r/subselect_mat.result'
--- a/mysql-test/r/subselect_mat.result	2010-04-06 13:54:40 +0000
+++ b/mysql-test/r/subselect_mat.result	2010-05-03 12:19:23 +0000
@@ -1216,7 +1216,7 @@ SET @@optimizer_switch='default,semijoin
 EXPLAIN SELECT pk FROM t1 WHERE (a) IN (SELECT a FROM t2 WHERE pk > 0);
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	2	
-1	PRIMARY	t2	range	PRIMARY	PRIMARY	4	NULL	2	Using where; Materialize
+1	PRIMARY	t2	range	PRIMARY	PRIMARY	4	NULL	2	Using index condition; Using MRR; Materialize
 SELECT pk FROM t1 WHERE (a) IN (SELECT a FROM t2 WHERE pk > 0);
 pk
 2

=== modified file 'mysql-test/r/subselect_sj.result'
--- a/mysql-test/r/subselect_sj.result	2010-05-02 19:14:50 +0000
+++ b/mysql-test/r/subselect_sj.result	2010-05-03 12:19:23 +0000
@@ -69,7 +69,7 @@ Note	1003	select `test`.`t1`.`a` AS `a`,
 subqueries within outer joins go into ON expr.
 explAin extended
 select * from t1 left join (t2 A, t2 B) on ( A.A= t1.A And B.A in (select pk from t10));
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	ExtrA
+id	select_type	tABle	type	possiBle_keys	key	key_len	ref	rows	filtered	ExtrA
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	
 1	PRIMARY	A	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 1	PRIMARY	B	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
@@ -79,7 +79,7 @@ Note	1003	select `test`.`t1`.`A` AS `A`,
 t2 should be wrapped into OJ-nest, so we have "t1 LJ (t2 J t10)"
 explAin extended
 select * from t1 left join t2 on (t2.A= t1.A And t2.A in (select pk from t10));
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	filtered	ExtrA
+id	select_type	tABle	type	possiBle_keys	key	key_len	ref	rows	filtered	ExtrA
 1	PRIMARY	t1	ALL	NULL	NULL	NULL	NULL	3	100.00	
 1	PRIMARY	t2	ALL	NULL	NULL	NULL	NULL	3	100.00	Using where
 2	DEPENDENT SUBQUERY	t10	unique_suBquery	PRIMARY	PRIMARY	4	func	1	100.00	Using index


Attachment: [text/bzr-bundle]