summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.com>2019-07-25 04:38:05 +0400
committerAlexander Barkov <bar@mariadb.com>2019-07-25 14:49:33 +0400
commit061a0f0b8db7ae83930a343da1262014d4479555 (patch)
treeb1a508c1cbe27ae5ca01c777a9319525e3e88906 /sql/item.cc
parent5cc2096f93b7f130b36f8bc0fc43440db9a848e4 (diff)
downloadmariadb-git-061a0f0b8db7ae83930a343da1262014d4479555.tar.gz
MDEV-20175 Move Type_handler_row from Type_collection_std to Type_collection_row
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item.cc b/sql/item.cc
index 41af37a3a42..42bcb216935 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -978,7 +978,7 @@ bool Item::check_type_general_purpose_string(const char *opname) const
bool Item::check_type_traditional_scalar(const char *opname) const
{
const Type_handler *handler= type_handler();
- if (handler->is_traditional_type() && handler->is_scalar_type())
+ if (handler->is_traditional_scalar_type())
return false;
my_error(ER_ILLEGAL_PARAMETER_DATA_TYPE_FOR_OPERATION, MYF(0),
handler->name().ptr(), opname);