summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorAlexander Barkov <bar@mariadb.org>2016-11-02 08:20:15 +0400
committerAlexander Barkov <bar@mariadb.org>2016-11-02 08:20:15 +0400
commitc18054deb2b5cfcf1f13aa71574406f2bafb87c6 (patch)
treefa1c0b3dfaa6729134e09ec2c2499d0012e94322 /sql
parent554c60ab0d383e8e6d473294fb86a9db0b0d2b9b (diff)
downloadmariadb-git-c18054deb2b5cfcf1f13aa71574406f2bafb87c6.tar.gz
MDEV-10347 mysqld got signal 11
Diffstat (limited to 'sql')
-rw-r--r--sql/item_cmpfunc.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/item_cmpfunc.h b/sql/item_cmpfunc.h
index 2e066b895e9..9a9d0e65ff6 100644
--- a/sql/item_cmpfunc.h
+++ b/sql/item_cmpfunc.h
@@ -1022,6 +1022,11 @@ public:
Item_func_hybrid_field_type(thd, a, b, a),
m_cache(NULL)
{ arg_count--; }
+ void cleanup()
+ {
+ Item_func_hybrid_field_type::cleanup();
+ arg_count= 2; // See the comment to the constructor
+ }
bool date_op(MYSQL_TIME *ltime, uint fuzzydate);
double real_op();
longlong int_op();