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

The patch for MDEV-23551 did not compile on some compilers. Fixing.

Browse Source
This commit is contained in:
Alexander Barkov
2020-08-24 14:27:32 +04:00
parent 04ce29354b
commit 056766c042
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_type.h
View File

@ -1056,6 +1056,13 @@ public:
} }
// End of constuctors // End of constuctors
bool copy_valid_value_to_mysql_time(MYSQL_TIME *ltime) const
{
DBUG_ASSERT(is_valid_temporal());
*ltime= *this;
return false;
}
longlong to_longlong() const longlong to_longlong() const
{ {
if (!is_valid_temporal()) if (!is_valid_temporal())
@ -1976,7 +1983,7 @@ public:
} }
explicit Date(const Temporal_hybrid *from) explicit Date(const Temporal_hybrid *from)
{ {
*(static_cast<MYSQL_TIME*>(this))= *from; from->copy_valid_value_to_mysql_time(this);
DBUG_ASSERT(is_valid_date_slow()); DBUG_ASSERT(is_valid_date_slow());
} }
bool is_valid_date() const bool is_valid_date() const
@ -2240,7 +2247,7 @@ public:
} }
explicit Datetime(const Temporal_hybrid *from) explicit Datetime(const Temporal_hybrid *from)
{ {
*(static_cast<MYSQL_TIME*>(this))= *from; from->copy_valid_value_to_mysql_time(this);
DBUG_ASSERT(is_valid_datetime_slow()); DBUG_ASSERT(is_valid_datetime_slow());
} }
explicit Datetime(const MYSQL_TIME *from) explicit Datetime(const MYSQL_TIME *from)