diff options
| author | unknown <kaa@kaamos.(none)> | 2008-01-19 22:13:42 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-01-19 22:13:42 +0300 |
| commit | 80857e0d74b77eb24d620e391b7ead82dd63a394 (patch) | |
| tree | 32eb94180c6bee35b9cc18526c56357a54abc8ee /mysql-test | |
| parent | 153771ed7f62d1db025c4b2569b524d8b57a40eb (diff) | |
| download | mariadb-git-80857e0d74b77eb24d620e391b7ead82dd63a394.tar.gz | |
Post-merge fixes.
mysql-test/r/group_by.result:
Post-merge fix after merging 5.0-opt to 5.1-opt.
mysql-test/t/disabled.def:
Disabled innodb_mysql back, bug #32724 is still not fixed.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/group_by.result | 36 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 1 |
2 files changed, 1 insertions, 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 |