diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-23 20:26:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-24 11:46:08 +0200 |
| commit | 5ae8fce50bb5cbd7916acd6b03bd699f79c10616 (patch) | |
| tree | 6291ec25e408ea225531e8b79a4f4fd7f3a81329 /sql/sql_error.h | |
| parent | 76098f45b8b1f2224eb25cf5d94450c6f4a1414c (diff) | |
| parent | 1fc5a6f30c3a9c047dcf9a36b00026d98f286f6b (diff) | |
| download | mariadb-git-5ae8fce50bb5cbd7916acd6b03bd699f79c10616.tar.gz | |
Merge branch '10.1' into 10.2
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 0a1e7d38e01..3ac06657323 100644 --- a/sql/sql_error.h +++ b/sql/sql_error.h @@ -19,6 +19,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 "sql_plist.h" /* I_P_List */ #include "mysql_com.h" /* MYSQL_ERRMSG_SIZE */ @@ -577,13 +578,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) : |