diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-07-25 04:38:05 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-07-25 14:49:33 +0400 |
| commit | 061a0f0b8db7ae83930a343da1262014d4479555 (patch) | |
| tree | b1a508c1cbe27ae5ca01c777a9319525e3e88906 /sql/item_timefunc.cc | |
| parent | 5cc2096f93b7f130b36f8bc0fc43440db9a848e4 (diff) | |
| download | mariadb-git-061a0f0b8db7ae83930a343da1262014d4479555.tar.gz | |
MDEV-20175 Move Type_handler_row from Type_collection_std to Type_collection_row
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index de0c5bd520b..82446cdd0da 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2001,7 +2001,7 @@ bool Item_date_add_interval::fix_length_and_dec() { enum_field_types arg0_field_type; - if (!args[0]->type_handler()->is_traditional_type()) + if (!args[0]->type_handler()->is_traditional_scalar_type()) { my_error(ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION, MYF(0), args[0]->type_handler()->name().ptr(), @@ -2505,8 +2505,8 @@ bool Item_func_add_time::fix_length_and_dec() { enum_field_types arg0_field_type; - if (!args[0]->type_handler()->is_traditional_type() || - !args[1]->type_handler()->is_traditional_type()) + if (!args[0]->type_handler()->is_traditional_scalar_type() || + !args[1]->type_handler()->is_traditional_scalar_type()) { my_error(ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION, MYF(0), args[0]->type_handler()->name().ptr(), @@ -2916,8 +2916,8 @@ get_date_time_result_type(const char *format, uint length) bool Item_func_str_to_date::fix_length_and_dec() { - if (!args[0]->type_handler()->is_traditional_type() || - !args[1]->type_handler()->is_traditional_type()) + if (!args[0]->type_handler()->is_traditional_scalar_type() || + !args[1]->type_handler()->is_traditional_scalar_type()) { my_error(ER_ILLEGAL_PARAMETER_DATA_TYPES2_FOR_OPERATION, MYF(0), args[0]->type_handler()->name().ptr(), |