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.h | |
| 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.h')
| -rw-r--r-- | sql/sql_class.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.h b/sql/sql_class.h index ab188c18735..b56de95cdd6 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -3552,7 +3552,7 @@ public: { return !MY_TEST(variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES); } - const Type_handler *type_handler_for_date() const; + const Type_handler *type_handler_for_datetime() const; bool timestamp_to_TIME(MYSQL_TIME *ltime, my_time_t ts, ulong sec_part, date_mode_t fuzzydate); inline my_time_t query_start() { return start_time; } |