diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-26 20:49:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-28 16:37:06 +0200 |
| commit | 57e0da50bbef8164635317785b67dd468a908327 (patch) | |
| tree | 89d1ed179afce8b040c8f2dfcfe179042ff27b2e /sql/sql_error.h | |
| parent | 7aba6f8f8853acd18d471793f8b72aa1412b8151 (diff) | |
| parent | dcbd51cee628d8d8fec9ff5476a6afc855b007aa (diff) | |
| download | mariadb-git-57e0da50bbef8164635317785b67dd468a908327.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'sql/sql_error.h')
| -rw-r--r-- | sql/sql_error.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sql/sql_error.h b/sql/sql_error.h index 88355e529b5..822503f89d3 100644 --- a/sql/sql_error.h +++ b/sql/sql_error.h @@ -18,11 +18,11 @@ #define SQL_ERROR_H #include "sql_list.h" /* Sql_alloc, MEM_ROOT, list */ -#include "m_string.h" /* LEX_STRING */ -#include "sql_string.h" /* String */ -#include "sql_plist.h" /* I_P_List */ -#include "mysql_com.h" /* MYSQL_ERRMSG_SIZE */ -#include "my_time.h" /* MYSQL_TIME */ +#include "sql_type_int.h" // Longlong_hybrid +#include "sql_string.h" /* String */ +#include "sql_plist.h" /* I_P_List */ +#include "mysql_com.h" /* MYSQL_ERRMSG_SIZE */ +#include "my_time.h" /* MYSQL_TIME */ #include "decimal.h" class THD; @@ -843,13 +843,11 @@ public: } }; -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) : |