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 remote-tracking branch 'origin/10.4' into 10.5

Browse Source
This commit is contained in:
Alexander Barkov
2020-08-23 15:55:50 +04:00
parent 6708e67acc 2e5d86f49e
commit 6f42cae0a1
5 changed files with 88 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_type.h
View File

@ -1687,6 +1687,13 @@ public:
Time(int *warn, bool neg, ulonglong hour, uint minute, const Sec6 &second);
Time() { time_type= MYSQL_TIMESTAMP_NONE; }
Time(const Native &native);
Time(THD *thd, const MYSQL_TIME *ltime, const Options opt)
{
*(static_cast<MYSQL_TIME*>(this))= *ltime;
DBUG_ASSERT(is_valid_temporal());
int warn= 0;
valid_MYSQL_TIME_to_valid_value(thd, &warn, opt);
}
Time(Item *item)
:Time(current_thd, item)
{ }