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 branch '10.4' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-08-04 17:24:15 +02:00
parent bbd70fcc43 9a156e1a23
commit 48b5777ebd
144 changed files with 3475 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@ -1226,10 +1226,8 @@ extern "C" my_thread_id next_thread_id_noinline()
#endif
const Type_handler *THD::type_handler_for_date() const
const Type_handler *THD::type_handler_for_datetime() const
{
if (!(variables.sql_mode & MODE_ORACLE))
return &type_handler_newdate;
if (opt_mysql56_temporal_format)
return &type_handler_datetime2;
return &type_handler_datetime;