Merge mysql.com:/home/ram/work/b32558/b32558.5.0

into  mysql.com:/home/ram/work/b32558/b32558.5.1
parents 6339719b 924bdf2c
......@@ -726,3 +726,11 @@ count(a)
3
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
......@@ -367,3 +367,12 @@ select count(a) from t1 group by null with rollup;
drop table t1;
--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
......@@ -789,7 +789,7 @@ public:
max_length= args[0]->max_length;
decimals=args[0]->decimals;
/* The item could be a NULL constant. */
null_value= args[0]->null_value;
null_value= args[0]->is_null();
}
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment