diff options
| author | unknown <konstantin@mysql.com> | 2005-07-19 00:55:37 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-07-19 00:55:37 +0400 |
| commit | 7f6f31ae73674eb65f4881608b22c843efc23179 (patch) | |
| tree | 751108ce077ef66187d4c557a01975a26665d188 /mysql-test/r/olap.result | |
| parent | 21332fe0a0b510d7b5f5f171a41cbede1965c623 (diff) | |
| parent | ddc3586495aa82f310b0e5c2127b77f28c711c27 (diff) | |
| download | mariadb-git-7f6f31ae73674eb65f4881608b22c843efc23179.tar.gz | |
Merge mysql.com:/home/kostja/mysql/mysql-4.1-root
into mysql.com:/home/kostja/mysql/mysql-5.0-merge
client/mysqltest.c:
Auto merged
mysql-test/r/rpl_log.result:
Auto merged
mysql-test/r/rpl_rotate_logs.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/r/timezone_grant.result:
Auto merged
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/timezone_grant.test:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_repl.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
tests/mysql_client_test.c:
Auto merged
configure.in:
Manual merge
mysql-test/r/olap.result:
Manual merge
mysql-test/t/olap.test:
Manual merge
mysql-test/t/select.test:
Manual merge
sql/mysqld.cc:
Manual merge
sql/sql_parse.cc:
Manual merge
Diffstat (limited to 'mysql-test/r/olap.result')
| -rw-r--r-- | mysql-test/r/olap.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index a19734d55b5..0b422047a49 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -576,4 +576,15 @@ EXPLAIN SELECT type FROM v1 GROUP BY type WITH ROLLUP; id select_type table type possible_keys key key_len ref rows Extra 1 PRIMARY t1 ALL NULL NULL NULL NULL 10 Using filesort DROP VIEW v1; +CREATE TABLE t1 (a INT(10) NOT NULL, b INT(10) NOT NULL); +INSERT INTO t1 VALUES (1, 1); +INSERT INTO t1 VALUES (1, 2); +SELECT a, b, a AS c, COUNT(*) AS count FROM t1 GROUP BY a, b, c WITH ROLLUP; +a b c count +1 1 1 1 +1 1 NULL 1 +1 2 1 1 +1 2 NULL 1 +1 NULL NULL 2 +NULL NULL NULL 2 DROP TABLE t1; |