diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-04-24 10:57:31 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-04-24 10:57:31 +0400 |
| commit | 3cd7690a5e79d73ccb3f8e1e071c523e7c6ef9b1 (patch) | |
| tree | 9399a4b36b9a1a268ce495c889ceaab8fd8c0605 /sql/item_timefunc.cc | |
| parent | 5a759d31f766087d5e135e1d3d3d987693bc9b88 (diff) | |
| download | mariadb-git-3cd7690a5e79d73ccb3f8e1e071c523e7c6ef9b1.tar.gz | |
MDEV-12568 Add Type_handler::subquery_type_allows_materialization()
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index d637fa12ad1..a7f131f384b 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -1532,7 +1532,7 @@ String *Item_temporal_hybrid_func::val_str_ascii(String *str) /* Check that the returned timestamp type matches to the function type */ DBUG_ASSERT(field_type() == MYSQL_TYPE_STRING || ltime.time_type == MYSQL_TIMESTAMP_NONE || - mysql_type_to_time_type(field_type()) == ltime.time_type); + ltime.time_type == mysql_timestamp_type()); return str; } @@ -3226,7 +3226,7 @@ void Item_func_str_to_date::fix_length_and_dec() } } } - cached_timestamp_type= mysql_type_to_time_type(field_type()); + cached_timestamp_type= mysql_timestamp_type(); } |