diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-09-16 13:51:05 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-09-16 13:51:05 +0200 |
| commit | 2bb0fddf8ec2a0fa788f8d6f96cac6a3ad4d76ba (patch) | |
| tree | e70c523b9a4b74bfe0cefb14f3af79534b229ba3 /mysql-test | |
| parent | f78278efbdfec344e80604db4ef8fb60cae46bed (diff) | |
| download | mariadb-git-2bb0fddf8ec2a0fa788f8d6f96cac6a3ad4d76ba.tar.gz | |
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.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/subselect3.result | 2 | ||||
| -rw-r--r-- | mysql-test/t/subselect3.test | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/r/subselect3.result b/mysql-test/r/subselect3.result index f055b40116a..a661ec5c78b 100644 --- a/mysql-test/r/subselect3.result +++ b/mysql-test/r/subselect3.result @@ -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; diff --git a/mysql-test/t/subselect3.test b/mysql-test/t/subselect3.test index 7a2a9f328ef..ee90fb9ff52 100644 --- a/mysql-test/t/subselect3.test +++ b/mysql-test/t/subselect3.test @@ -672,6 +672,8 @@ SELECT ROW(1,2) = (SELECT 1, 2), ROW(1,2) IN (SELECT 1, 2); # # 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); |