1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/ram/work/mysql-5.0-engines

Browse Source 
into  mysql.com:/home/ram/work/b32558/b32558.5.0
This commit is contained in:
ramil/ram@mysql.com/ramil.myoffice.izhnet.ru 2007-11-23 13:04:13 +04:00
commit a13b5e9d80
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mysql-test/r/olap.result
View File

@ -726,3 +726,11 @@ count(a)
3 3
drop table t1; drop table t1;
############################################################## ##############################################################
CREATE TABLE t1(a INT);
INSERT INTO t1 VALUES(0);
SELECT 1 FROM t1 GROUP BY (DATE(NULL)) WITH ROLLUP;
1
1
1
DROP TABLE t1;
End of 5.0 tests

9
mysql-test/t/olap.test
View File

@ -367,3 +367,12 @@ select count(a) from t1 group by null with rollup;
drop table t1; drop table t1;
--echo ############################################################## --echo ##############################################################
#
# Bug #32558: group by null-returning expression with rollup causes crash
#
CREATE TABLE t1(a INT);
INSERT INTO t1 VALUES(0);
SELECT 1 FROM t1 GROUP BY (DATE(NULL)) WITH ROLLUP;
DROP TABLE t1;
--echo End of 5.0 tests

2
sql/item_func.h
View File

@ -782,7 +782,7 @@ public:
max_length= args[0]->max_length; max_length= args[0]->max_length;
decimals=args[0]->decimals; decimals=args[0]->decimals;
/* The item could be a NULL constant. */ /* The item could be a NULL constant. */
null_value= args[0]->null_value; null_value= args[0]->is_null();
} }
}; };