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

Merge branch '10.3' into 10.4

Browse Source
This commit is contained in:
Oleksandr Byelkin
2020-08-03 14:44:06 +02:00
parent 706a7101bf c32f71af7e
commit 57325e4706
134 changed files with 2307 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@ -1205,10 +1205,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;