diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-04 17:24:15 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-08-04 17:24:15 +0200 |
| commit | 48b5777ebda9bf14c60ad05298dac67933e9799f (patch) | |
| tree | 2c023b5cc7811faea8a9b4ad82998e4624c29068 /sql/sql_class.cc | |
| parent | bbd70fcc43cc889e4593594ee5ca436fe1433aac (diff) | |
| parent | 9a156e1a23046ba3e37bdb1e4e1ad887d3f5829b (diff) | |
| download | mariadb-git-48b5777ebda9bf14c60ad05298dac67933e9799f.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'sql/sql_class.cc')
| -rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index af0035e9003..702acb623ae 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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; |