From 6f451bf228f06e397ba9a93d454d0f69df20c19f Mon Sep 17 00:00:00 2001 From: "kaa@kaamos.(none)" <> Date: Sat, 19 Jan 2008 22:13:42 +0300 Subject: [PATCH] Post-merge fixes. --- mysql-test/r/group_by.result | 36 ------------------------------------ mysql-test/t/disabled.def | 1 + 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index ea50b38ff25..268f290ddca 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -1128,42 +1128,6 @@ id c1 c2 4 2 3 1 5 1 DROP TABLE t1; -CREATE TABLE t1 ( a INT, b INT ); -SELECT b c, (SELECT a FROM t1 WHERE b = c) -FROM t1; -c (SELECT a FROM t1 WHERE b = c) -SELECT b c, (SELECT a FROM t1 WHERE b = c) -FROM t1 -HAVING b = 10; -c (SELECT a FROM t1 WHERE b = c) -SELECT MAX(b) c, (SELECT a FROM t1 WHERE b = c) -FROM t1 -HAVING b = 10; -ERROR 42S22: Reference 'c' not supported (reference to group function) -SET @old_sql_mode = @@sql_mode; -SET @@sql_mode='ONLY_FULL_GROUP_BY'; -SELECT b c, (SELECT a FROM t1 WHERE b = c) -FROM t1; -c (SELECT a FROM t1 WHERE b = c) -SELECT b c, (SELECT a FROM t1 WHERE b = c) -FROM t1 -HAVING b = 10; -ERROR 42000: non-grouping field 'b' is used in HAVING clause -SELECT MAX(b) c, (SELECT a FROM t1 WHERE b = c) -FROM t1 -HAVING b = 10; -ERROR 42S22: Reference 'c' not supported (reference to group function) -INSERT INTO t1 VALUES (1, 1); -SELECT b c, (SELECT a FROM t1 WHERE b = c) -FROM t1; -c (SELECT a FROM t1 WHERE b = c) -1 1 -INSERT INTO t1 VALUES (2, 1); -SELECT b c, (SELECT a FROM t1 WHERE b = c) -FROM t1; -ERROR 21000: Subquery returns more than 1 row -DROP TABLE t1; -SET @@sql_mode = @old_sql_mode; End of 5.0 tests CREATE TABLE t1 (a INT, b INT, PRIMARY KEY (a), diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index 286a7b06ea6..3f9ec52ca36 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -18,6 +18,7 @@ federated_transactions : Bug#29523 Transactions do not work events : Bug#32664 events.test fails randomly lowercase_table3 : Bug#32667 lowercase_table3.test reports to error log kill : Bug#29149: Test "kill" fails on Windows +innodb_mysql : Bug#32724: innodb_mysql.test fails randomly wait_timeout : Bug#32801 wait_timeout.test fails randomly ctype_create : Bug#32965 main.ctype_create fails status : Bug#32966 main.status fails -- 2.30.9