diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-29 18:45:19 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-10-29 18:45:19 +0200 |
| commit | 2ee9343c873ad31c2dd0d2175dec2ef3b48ca5ba (patch) | |
| tree | aa51c10a594658b3668ff850c8fa7ece175a2692 /sql/sql_error.h | |
| parent | 8b92c642981e7b226e0d93b958cc470bb1e6fad0 (diff) | |
| parent | 893ebb739e24637985892da1555f2e6f1a8ac5b6 (diff) | |
| download | mariadb-git-mariadb-galera-5.5.62.tar.gz | |
Merge tag 'mariadb-5.5.62' into 5.5-galeramariadb-galera-5.5.62
Diffstat (limited to 'sql/sql_error.h')
| -rw-r--r-- | sql/sql_error.h | 7 |
1 files changed, 3 insertions, 4 deletions
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) : |