From 0c6455aa4658790439a58956f05df200a5e380b8 Mon Sep 17 00:00:00 2001 From: Alexander Barkov Date: Thu, 20 Sep 2018 16:02:58 +0400 Subject: MDEV-17249 MAKETIME(-1e50,0,0) returns a wrong result --- sql/sql_error.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sql/sql_error.h') diff --git a/sql/sql_error.h b/sql/sql_error.h index 5f912ad8102..903ad65521d 100644 --- a/sql/sql_error.h +++ b/sql/sql_error.h @@ -18,6 +18,7 @@ #include "sql_list.h" /* Sql_alloc, MEM_ROOT */ #include "m_string.h" /* LEX_STRING */ +#include "sql_type_int.h" // Longlong_hybrid #include "sql_string.h" /* String */ #include "mysql_com.h" /* MYSQL_ERRMSG_SIZE */ @@ -542,13 +543,11 @@ public: { return err_conv(err_buffer, sizeof(err_buffer), str, len, cs); } }; -class ErrConvInteger : public ErrConv +class ErrConvInteger : public ErrConv, public Longlong_hybrid { - longlong m_value; - bool m_unsigned; public: ErrConvInteger(longlong num_arg, bool unsigned_flag= false) : - ErrConv(), m_value(num_arg), m_unsigned(unsigned_flag) {} + ErrConv(), Longlong_hybrid(num_arg, unsigned_flag) {} const char *ptr() const { return m_unsigned ? ullstr(m_value, err_buffer) : -- cgit v1.2.1