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

Merge 5.3->5.5

Browse Source
This commit is contained in:
Alexander Barkov
2014-06-04 21:53:15 +04:00
parent 55bfabf971 661daf16f1
commit 284479c085
24 changed files with 220 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_error.h
View File

@ -544,11 +544,16 @@ public:
class ErrConvInteger : public ErrConv
{
longlong num;
longlong m_value;
bool m_unsigned;
public:
ErrConvInteger(longlong num_arg) : ErrConv(), num(num_arg) {}
ErrConvInteger(longlong num_arg, bool unsigned_flag= false) :
ErrConv(), m_value(num_arg), m_unsigned(unsigned_flag) {}
const char *ptr() const
{ return llstr(num, err_buffer); }
{
return m_unsigned ? ullstr(m_value, err_buffer) :
llstr(m_value, err_buffer);
}
};
class ErrConvDouble: public ErrConv