summaryrefslogtreecommitdiff
path: root/sql/item_timefunc.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-08-05 14:41:17 +0400
committerAlexander Barkov <bar@mariadb.com>2019-08-05 14:41:17 +0400
commitc99f9766b11bda7eb15d6875f2f1e64c2d01b461 (patch)
treec9fadd3d0e98b6d3fd9bdb0696c3c2440779373c /sql/item_timefunc.cc
parente244652831932ab9deed83d38dd3f6f1958b91ef (diff)
downloadmariadb-git-c99f9766b11bda7eb15d6875f2f1e64c2d01b461.tar.gz
MDEV-19166 Assertion `!is_zero_datetime()' failed in Timestamp_or_zero_datetime::tv
Diffstat (limited to 'sql/item_timefunc.cc')
-rw-r--r--sql/item_timefunc.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc
index 2c527154108..d3433963c25 100644
--- a/sql/item_timefunc.cc
+++ b/sql/item_timefunc.cc
@@ -1220,7 +1220,7 @@ bool Item_func_unix_timestamp::get_timestamp_value(my_time_t *seconds,
Timestamp_or_zero_datetime_native_null native(current_thd, args[0], true);
if ((null_value= native.is_null() || native.is_zero_datetime()))
return true;
- Timestamp_or_zero_datetime tm(native);
+ Timestamp tm(native);
*seconds= tm.tv().tv_sec;
*second_part= tm.tv().tv_usec;
return false;