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 10.11 into 11.2

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 13:24:43 +03:00
parent f1b4d36cc3 63913ce5af
commit 12a91b57e2
548 changed files with 5714 additions and 1374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_type.cc
View File

@ -9279,6 +9279,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));
}