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 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2019-12-27 21:17:16 +02:00
parent cc28947315 b86e0f25f8
commit 8cc15c036d
87 changed files with 1405 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_type.h
View File

@ -1887,6 +1887,10 @@ protected:
{
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);
}
ulong dayofyear() const
{
return (ulong) (daynr() - ::calc_daynr(year, 1, 1) + 1);
@ -2267,6 +2271,11 @@ public:
DBUG_ASSERT(is_valid_datetime_slow());
return Temporal_with_date::daynr();
}
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);
}
ulong dayofyear() const
{
DBUG_ASSERT(is_valid_datetime_slow());