diff options
| author | unknown <gshchepa/uchum@host.loc> | 2008-02-28 23:01:22 +0400 |
|---|---|---|
| committer | unknown <gshchepa/uchum@host.loc> | 2008-02-28 23:01:22 +0400 |
| commit | ee51eeb6de5d5c05e39e95de468ee224b93a683f (patch) | |
| tree | 8be5b5d9e23595afaa43a9473088965bbea26721 /mysql-test | |
| parent | f1e18173dcd7da7a536b86dd78d868f64b1752fe (diff) | |
| parent | d40ca16156641481abd45f93e31233044f4b9df6 (diff) | |
| download | mariadb-git-ee51eeb6de5d5c05e39e95de468ee224b93a683f.tar.gz | |
Merge host.loc:/home/uchum/work/PP/5.0-opt-34620
into host.loc:/home/uchum/work/5.1-opt
mysql-test/r/row.result:
Auto merged
sql/item.h:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/row.result | 9 | ||||
| -rw-r--r-- | mysql-test/t/row.test | 13 |
2 files changed, 22 insertions, 0 deletions
diff --git a/mysql-test/r/row.result b/mysql-test/r/row.result index d3d7988316e..3feaa6255c1 100644 --- a/mysql-test/r/row.result +++ b/mysql-test/r/row.result @@ -434,3 +434,12 @@ SELECT @x; @x 99 DROP TABLE t1; +CREATE TABLE t1 (a INT, b INT); +INSERT INTO t1 VALUES (1,1); +SELECT ROW(a, 1) IN (SELECT SUM(b), 1) FROM t1 GROUP BY a; +ROW(a, 1) IN (SELECT SUM(b), 1) +1 +SELECT ROW(a, 1) IN (SELECT SUM(b), 3) FROM t1 GROUP BY a; +ROW(a, 1) IN (SELECT SUM(b), 3) +0 +DROP TABLE t1; diff --git a/mysql-test/t/row.test b/mysql-test/t/row.test index 20d044306a6..1601f7afd0e 100644 --- a/mysql-test/t/row.test +++ b/mysql-test/t/row.test @@ -224,3 +224,16 @@ SET @x:= (SELECT h FROM t1 WHERE (a,b,c,d,e,f,g)=(1,2,3,4,5,6,7)); SELECT @x; DROP TABLE t1; + +# +# Bug #34620: item_row.cc:50: Item_row::illegal_method_call(const char*): +# Assertion `0' failed +# + +CREATE TABLE t1 (a INT, b INT); +INSERT INTO t1 VALUES (1,1); + +SELECT ROW(a, 1) IN (SELECT SUM(b), 1) FROM t1 GROUP BY a; +SELECT ROW(a, 1) IN (SELECT SUM(b), 3) FROM t1 GROUP BY a; + +DROP TABLE t1; |