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

Cleanup: Datetime() constructors accepting Longlong_hybrid/Sec6 do not need THD

Browse Source 
Removing the unused THD* parameter.
This commit is contained in:
Alexander Barkov
2018-12-10 13:06:20 +04:00
parent 8cf7e3459d
commit e5144f4bad
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/field.cc
View File

@ -5118,7 +5118,7 @@ int Field_timestamp::store(longlong nr, bool unsigned_val)
Longlong_hybrid tmp(nr, unsigned_val); Longlong_hybrid tmp(nr, unsigned_val);
ErrConvInteger str(tmp); ErrConvInteger str(tmp);
THD *thd= get_thd(); THD *thd= get_thd();
Datetime dt(thd, &error, tmp, Timestamp::DatetimeOptions(thd)); Datetime dt(&error, tmp, Timestamp::DatetimeOptions(thd));
return store_TIME_with_warning(thd, &dt, &str, error); return store_TIME_with_warning(thd, &dt, &str, error);
} }
@ -5596,7 +5596,7 @@ int Field_datetime::store(longlong nr, bool unsigned_val)
Longlong_hybrid tmp(nr, unsigned_val); Longlong_hybrid tmp(nr, unsigned_val);
ErrConvInteger str(tmp); ErrConvInteger str(tmp);
THD *thd= get_thd(); THD *thd= get_thd();
Datetime dt(thd, &error, tmp, Datetime::Options(thd)); Datetime dt(&error, tmp, Datetime::Options(thd));
return store_TIME_with_warning(&dt, &str, error); return store_TIME_with_warning(&dt, &str, error);
} }
@ -6314,7 +6314,7 @@ int Field_date_common::store(longlong nr, bool unsigned_val)
Longlong_hybrid tmp(nr, unsigned_val); Longlong_hybrid tmp(nr, unsigned_val);
ErrConvInteger str(tmp); ErrConvInteger str(tmp);
THD *thd= get_thd(); THD *thd= get_thd();
Datetime dt(thd, &error, tmp, Date::Options(thd)); Datetime dt(&error, tmp, Date::Options(thd));
return store_TIME_with_warning(&dt, &str, error); return store_TIME_with_warning(&dt, &str, error);
} }

8
sql/sql_type.h
View File

@ -1950,14 +1950,14 @@ public:
} }
protected: protected:
Datetime(THD *thd, int *warn, const Sec6 &nr, date_mode_t flags) Datetime(int *warn, const Sec6 &nr, date_mode_t flags)
:Temporal_with_date(warn, nr, flags) :Temporal_with_date(warn, nr, flags)
{ {
date_to_datetime_if_needed(); date_to_datetime_if_needed();
DBUG_ASSERT(is_valid_value_slow()); DBUG_ASSERT(is_valid_value_slow());
} }
Datetime(THD *thd, int *warn, const Sec9 &nr, date_mode_t fuzzydate) Datetime(THD *thd, int *warn, const Sec9 &nr, date_mode_t fuzzydate)
:Datetime(thd, warn, static_cast<const Sec6>(nr), fuzzydate) :Datetime(warn, static_cast<const Sec6>(nr), fuzzydate)
{ {
if (is_valid_datetime() && if (is_valid_datetime() &&
time_round_mode_t(fuzzydate) == TIME_FRAC_ROUND) time_round_mode_t(fuzzydate) == TIME_FRAC_ROUND)
@ -1966,8 +1966,8 @@ protected:
} }
public: public:
Datetime(THD *thd, int *warn, const Longlong_hybrid &nr, date_mode_t mode) Datetime(int *warn, const Longlong_hybrid &nr, date_mode_t mode)
:Datetime(thd, warn, Sec6(nr), mode) :Datetime(warn, Sec6(nr), mode)
{ } { }
Datetime(THD *thd, int *warn, double nr, date_mode_t fuzzydate) Datetime(THD *thd, int *warn, double nr, date_mode_t fuzzydate)
:Datetime(thd, warn, Sec9(nr), fuzzydate) :Datetime(thd, warn, Sec9(nr), fuzzydate)