1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding "const" qualifier into a few methods in Field.

Browse Source
This commit is contained in:
Alexander Barkov 2015-06-18 23:27:44 +04:00
parent 091f67738e
commit 366cda4937
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sql/field.cc
View File

@ -10210,6 +10210,7 @@ Field::set_warning(Sql_condition::enum_warning_level level, uint code,
void Field::set_datetime_warning(Sql_condition::enum_warning_level level, void Field::set_datetime_warning(Sql_condition::enum_warning_level level,
uint code, const ErrConv *str, uint code, const ErrConv *str,
timestamp_type ts_type, int cuted_increment) timestamp_type ts_type, int cuted_increment)
const
{ {
THD *thd= get_thd(); THD *thd= get_thd();
if (thd->really_abort_on_warning() && level >= Sql_condition::WARN_LEVEL_WARN) if (thd->really_abort_on_warning() && level >= Sql_condition::WARN_LEVEL_WARN)

6
sql/field.h
View File

@ -727,7 +727,7 @@ public:
null_bit= p_null_bit; null_bit= p_null_bit;
} }
inline THD *get_thd() { return table ? table->in_use : current_thd; } inline THD *get_thd() const { return table ? table->in_use : current_thd; }
enum { enum {
LAST_NULL_BYTE_UNDEF= 0 LAST_NULL_BYTE_UNDEF= 0
@ -897,7 +897,7 @@ public:
int cuted_increment) const; int cuted_increment) const;
void set_datetime_warning(Sql_condition::enum_warning_level, uint code, void set_datetime_warning(Sql_condition::enum_warning_level, uint code,
const ErrConv *str, timestamp_type ts_type, const ErrConv *str, timestamp_type ts_type,
int cuted_increment); int cuted_increment) const;
inline bool check_overflow(int op_result) inline bool check_overflow(int op_result)
{ {
return (op_result == E_DEC_OVERFLOW); return (op_result == E_DEC_OVERFLOW);
@ -1682,7 +1682,7 @@ protected:
int was_cut, int have_smth_to_conv); int was_cut, int have_smth_to_conv);
virtual void store_TIME(MYSQL_TIME *ltime) = 0; virtual void store_TIME(MYSQL_TIME *ltime) = 0;
bool validate_for_get_date(bool not_zero_date, const MYSQL_TIME *ltime, bool validate_for_get_date(bool not_zero_date, const MYSQL_TIME *ltime,
ulonglong fuzzydate) ulonglong fuzzydate) const
{ {
if (!not_zero_date) if (!not_zero_date)
return fuzzydate & TIME_NO_ZERO_DATE; return fuzzydate & TIME_NO_ZERO_DATE;