diff options
| author | unknown <sergefp@mysql.com> | 2005-09-09 10:54:59 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2005-09-09 10:54:59 +0400 |
| commit | 20994fec52db1d95b085704c424ef5d292c9a307 (patch) | |
| tree | d061df624f7dfc9d9b60f22b9a9d7e570f0a819d /mysql-test/r/olap.result | |
| parent | cf0b4702f568ca76e78e1ac47e0e37e19f1b00f8 (diff) | |
| parent | 213fa9cbc234c1a10e50f2bf53b2e1f520284034 (diff) | |
| download | mariadb-git-20994fec52db1d95b085704c424ef5d292c9a307.tar.gz | |
Merge 4.1->5.0
client/mysqlimport.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
mysql-test/r/connect.result:
Auto merged
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/t/connect.test:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/backup/Backup.hpp:
Auto merged
ndb/src/kernel/main.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/ndbapi/Makefile.am:
Auto merged
ndb/test/src/NdbBackup.cpp:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'mysql-test/r/olap.result')
| -rw-r--r-- | mysql-test/r/olap.result | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mysql-test/r/olap.result b/mysql-test/r/olap.result index 69871b2110b..2e05c48d24f 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -555,6 +555,19 @@ IFNULL(a, 'TEST') COALESCE(b, 'TEST') 4 TEST TEST TEST DROP TABLE t1,t2; +DROP TABLE t1; +CREATE TABLE t1 (a int(11) NOT NULL); +INSERT INTO t1 VALUES (1),(2); +SELECT * FROM (SELECT a, a + 1, COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t; +a a + 1 COUNT(*) +1 2 1 +2 3 1 +NULL NULL 2 +SELECT * FROM (SELECT a, LENGTH(a), COUNT(*) FROM t1 GROUP BY a WITH ROLLUP) t; +a LENGTH(a) COUNT(*) +1 1 1 +2 1 1 +NULL NULL 2 CREATE TABLE t1(id int, type char(1)); INSERT INTO t1 VALUES (1,"A"),(2,"C"),(3,"A"),(4,"A"),(5,"B"), |