diff options
| author | unknown <monty@mysql.com> | 2005-02-03 18:00:50 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2005-02-03 18:00:50 +0200 |
| commit | 8e279c4cf8e3bba242ed7e1790227ff9a4c5d966 (patch) | |
| tree | 14992c6e4d00d432cd54fe1e99b8dd5ebba5a8b4 /mysql-test/r/derived.result | |
| parent | c41989a28e674829614068d0558bda2d220bdde2 (diff) | |
| download | mariadb-git-8e279c4cf8e3bba242ed7e1790227ff9a4c5d966.tar.gz | |
After merge fixes
sql/item.cc:
After merge fixes (bug during merge)
sql/sql_show.cc:
Ensure that lex->all_select_list is properly reset on function end
(Caused crashes after merge)
Diffstat (limited to 'mysql-test/r/derived.result')
| -rw-r--r-- | mysql-test/r/derived.result | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/r/derived.result b/mysql-test/r/derived.result index 8322933a360..071cb673501 100644 --- a/mysql-test/r/derived.result +++ b/mysql-test/r/derived.result @@ -330,11 +330,6 @@ SELECT MIN(price) min, MAX(price) max, AVG(price) avg FROM (SELECT SUBSTRING( MA min max avg 10.00 10.00 10 DROP TABLE t1; -CREATE TABLE t1 (a char(10), b char(10)); -INSERT INTO t1 VALUES ('root','localhost'), ('root','%'); -SELECT * FROM (SELECT (SELECT a.a FROM t1 AS a WHERE a.a = b.a) FROM t1 AS b) AS c; -ERROR 21000: Subquery returns more than 1 row -DROP TABLE t1; create table t1 (a integer, b integer); insert into t1 values (1,4), (2,2),(2,2), (4,1),(4,1),(4,1),(4,1); select distinct sum(b) from t1 group by a; @@ -344,3 +339,8 @@ select distinct sum(b) from (select a,b from t1) y group by a; sum(b) 4 drop table t1; +CREATE TABLE t1 (a char(10), b char(10)); +INSERT INTO t1 VALUES ('root','localhost'), ('root','%'); +SELECT * FROM (SELECT (SELECT a.a FROM t1 AS a WHERE a.a = b.a) FROM t1 AS b) AS c; +ERROR 21000: Subquery returns more than 1 row +DROP TABLE t1; |