database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.2' into 10.3

Browse Source
This commit is contained in:
Sergei Golubchik
2018-09-26 20:49:51 +02:00
parent 7aba6f8f88 dcbd51cee6
commit 57e0da50bb
436 changed files with 9699 additions and 196654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/sql_error.h
View File

@ -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) :