database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 11.2 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 14:32:14 +03:00
parent 90f090f22c 12a91b57e2
commit b53b81e937
560 changed files with 5796 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_type.cc
View File

@ -9411,6 +9411,7 @@ Type_handler_timestamp_common::Item_val_native_with_conversion(THD *thd,
Datetime dt(thd, item, Datetime::Options(TIME_NO_ZERO_IN_DATE, thd));
return
!dt.is_valid_datetime() ||
dt.check_date(TIME_NO_ZERO_IN_DATE | TIME_NO_ZERO_DATE) ||
TIME_to_native(thd, dt.get_mysql_time(), to, item->datetime_precision(thd));
}