diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-10-19 15:04:12 +0200 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-10-19 15:04:12 +0200 |
| commit | 5e1fe0f80043993c1db64169e4d87eb787762763 (patch) | |
| tree | 3b1cae348369aff41bc05399edc6b42f12f1d6dc /mysql-test/r/olap.result | |
| parent | d30186772fc90d9c16c118f0a72fff3f0be50e03 (diff) | |
| parent | 9bfaab57fa991d46844b5e56cb30880c8391c55d (diff) | |
| download | mariadb-git-5e1fe0f80043993c1db64169e4d87eb787762763.tar.gz | |
Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-opt
into dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-opt
sql/sql_select.cc:
Auto merged
mysql-test/r/olap.result:
SCCS merged
Diffstat (limited to 'mysql-test/r/olap.result')
| -rw-r--r-- | mysql-test/r/olap.result | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index 7cdd5e1b152..a392de613f8 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -592,6 +592,21 @@ a max(b) NULL 2 a 1 drop table t1; +create table t1 (a varchar(22) not null , b int); +insert into t1 values ("2006-07-01 21:30", 1), ("2006-07-01 23:30", 10); +select left(a,10), a, sum(b) from t1 group by 1,2 with rollup; +left(a,10) a sum(b) +2006-07-01 2006-07-01 21:30 1 +2006-07-01 2006-07-01 23:30 10 +2006-07-01 NULL 11 +NULL NULL 11 +select left(a,10) x, a, sum(b) from t1 group by x,a with rollup; +x a sum(b) +2006-07-01 2006-07-01 21:30 1 +2006-07-01 2006-07-01 23:30 10 +2006-07-01 NULL 11 +NULL NULL 11 +drop table t1; CREATE TABLE t1(id int, type char(1)); INSERT INTO t1 VALUES (1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"), |