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

MDEV-20417 Assertion `(m_ptr == __null) == item->null_value' failed in VDec::VDec(Item*)

Browse Source
This commit is contained in:
Alexander Barkov
2019-08-26 23:42:06 +04:00
parent 4a490d1a99
commit 72c5a8d39b
3 changed files with 50 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_type.h
View File

@ -2439,7 +2439,7 @@ public:
Datetime to_datetime(THD *thd) const
{
if (is_zero_datetime())
return Datetime();
return Datetime::zero();
return Timestamp::to_datetime(thd);
}
bool is_zero_datetime() const { return m_is_zero_datetime; }
@ -2487,7 +2487,7 @@ public:
Datetime to_datetime(THD *thd) const
{
return is_zero_datetime() ?
Datetime() :
Datetime::zero() :
Datetime(thd, Timestamp(*this).tv());
}
bool is_zero_datetime() const