From 29bbf4749ebcfe328d73ca93c7ee5908a339e850 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Tue, 27 Aug 2019 09:13:20 +0400 Subject: MDEV-19699 Server crashes in Item_null_result::field_type upon SELECT with ROLLUP on constant table Also fixes: MDEV-20431 GREATEST(int_col,date_col) returns wrong results in a view --- sql/item.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'sql/item.h') diff --git a/sql/item.h b/sql/item.h index edf9f748d77..a182d99f701 100644 --- a/sql/item.h +++ b/sql/item.h @@ -2627,6 +2627,8 @@ public: String *val_str(String *str); my_decimal *val_decimal(my_decimal *); bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate); + longlong val_datetime_packed(); + longlong val_time_packed(); int save_in_field(Field *field, bool no_conversions); int save_safe_in_field(Field *field); bool send(Protocol *protocol, String *str); @@ -3971,6 +3973,8 @@ public: String *val_str(String* tmp); bool is_null(); bool get_date(MYSQL_TIME *ltime, ulonglong fuzzydate); + longlong val_datetime_packed(); + longlong val_time_packed(); double val_result(); longlong val_int_result(); String *str_result(String* tmp); -- cgit v1.2.1