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

After-merge cleanup

Browse Source
This commit is contained in:
Alexander Barkov
2019-12-27 18:22:16 +04:00
committed by Marko Mäkelä
parent 5ab70e7f68
commit 1d9532cd8b
3 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/sql_type.h
View File

@ -292,6 +292,15 @@ class Temporal_with_date: protected MYSQL_TIME
{
protected:
void make_from_item(THD *thd, Item *item, sql_mode_t flags);
ulong daynr() const
{
return (ulong) ::calc_daynr((uint) year, (uint) month, (uint) day);
}
int weekday(bool sunday_first_day_of_week) const
{
return ::calc_weekday(daynr(), sunday_first_day_of_week);
}
Temporal_with_date(THD *thd, Item *item, sql_mode_t flags)
{
make_from_item(thd, item, flags);
@ -389,6 +398,11 @@ public:
DBUG_ASSERT(is_valid_datetime_slow());
return hour == 0 && minute == 0 && second == 0 && second_part == 0;
}
int weekday(bool sunday_first_day_of_week) const
{
DBUG_ASSERT(is_valid_datetime_slow());
return Temporal_with_date::weekday(sunday_first_day_of_week);
}
const MYSQL_TIME *get_mysql_time() const
{
DBUG_ASSERT(is_valid_datetime_slow());