#At lp:maria 2741 knielsen@knielsen-hq.org 2009-09-16 After-merge fixes for MySQL 5.1.38 merge. Temporarily silence test failure due to MBug#430669 in test case introduced from MySQL 5.1.38. modified: mysql-test/r/subselect3.result mysql-test/t/subselect3.test === modified file 'mysql-test/r/subselect3.result' --- a/mysql-test/r/subselect3.result 2009-08-13 20:33:00 +0000 +++ b/mysql-test/r/subselect3.result 2009-09-16 11:51:05 +0000 @@ -864,7 +864,7 @@ 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 (select count(`test`.`t1`.`b`) AS `COUNT(b)` from `test`.`t1`) `x` group by `c`) AS `(SELECT COUNT(a) FROM +Note 1003 select `c` AS `c` from (select (select count(`test`.`t1`.`a`) AS `COUNT(a)` from (select count(`test`.`t1`.`b`) AS `COUNT(b)` from `test`.`t1`) `x` group by `t1`.`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; === modified file 'mysql-test/t/subselect3.test' --- a/mysql-test/t/subselect3.test 2009-08-13 20:33:00 +0000 +++ b/mysql-test/t/subselect3.test 2009-09-16 11:51:05 +0000 @@ -672,6 +672,8 @@ SELECT ROW(1,2) = (SELECT 1, 2), R # # Bug #37362 Crash in do_field_eq # +# Note that currently this test produces wrong output, see MBug#430669. +# CREATE TABLE t1 (a INT, b INT, c INT); INSERT INTO t1 VALUES (1,1,1), (1,1,1);