diff options
| author | unknown <gluh@eagle.(none)> | 2007-10-04 14:23:55 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.(none)> | 2007-10-04 14:23:55 +0500 |
| commit | 4e15adf822090e226414904152d6e17a14288940 (patch) | |
| tree | f50dabc806c403577cfd9d2efa7e7dc5d5db38ef /mysql-test/r/olap.result | |
| parent | c3fb207658e2e8717d92c0ef26c9793906a57452 (diff) | |
| parent | a408f34866de14649b13dc1e4c08edf40a19db28 (diff) | |
| download | mariadb-git-4e15adf822090e226414904152d6e17a14288940.tar.gz | |
Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt
into mysql.com:/home/gluh/MySQL/Merge/5.1-opt
client/mysqldump.c:
Auto merged
mysql-test/r/func_math.result:
Auto merged
mysql-test/r/func_misc.result:
Auto merged
mysql-test/r/olap.result:
Auto merged
mysql-test/t/func_math.test:
Auto merged
mysql-test/t/func_misc.test:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/view_grant.test:
Auto merged
sql/item.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/sql_view.cc:
Auto merged
client/client_priv.h:
manual merge
mysql-test/r/mysqldump.result:
manual merge
mysql-test/r/view_grant.result:
manual merge
sql/field.cc:
manual merge
sql/sql_select.cc:
manual merge
tests/mysql_client_test.c:
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 67c45b698ce..63c9590401c 100644 --- a/mysql-test/r/olap.result +++ b/mysql-test/r/olap.result @@ -715,3 +715,14 @@ a SUM(a) 4 4 NULL 14 DROP TABLE t1; +# +# Bug#31095: Unexpected NULL constant caused server crash. +# +create table t1(a int); +insert into t1 values (1),(2),(3); +select count(a) from t1 group by null with rollup; +count(a) +3 +3 +drop table t1; +############################################################## |