diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-08-13 23:49:10 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-08-13 23:49:10 +0400 |
| commit | c1599821a55ac4f59c5c799480a07913e1c26daa (patch) | |
| tree | 0c064252ad3959fcd53b0f06a40b98d691fe070e /sql/item_timefunc.cc | |
| parent | 624dd71b9419555eca8baadc695e3376de72286f (diff) | |
| parent | c4fd167d5a740f67ee5287a9b05b5383403b9ed0 (diff) | |
| download | mariadb-git-c1599821a55ac4f59c5c799480a07913e1c26daa.tar.gz | |
Merge remote-tracking branch 'origin/10.4' into 10.5
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 97961a5e378..0057ed45c7d 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; |