summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorIgor Babaev <igor@askmonty.org>2012-06-15 00:01:20 -0700
committerIgor Babaev <igor@askmonty.org>2012-06-15 00:01:20 -0700
commit1d74ae6b42296edb585d42439ca472632c57d06e (patch)
tree0a9b35a34f5af3cfecc982632656f30df59340c2 /sql/item_func.h
parent28b4aba40a65006af33cc8e1464ab28643442309 (diff)
downloadmariadb-git-1d74ae6b42296edb585d42439ca472632c57d06e.tar.gz
Fixed LP bug #1002157.
The class Item_func missed an implementation of the virtual function update_null_value. Back-ported the fix for bug 62125 from mysql 5.6 code line. The test case was also back-ported.
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index f91107c5445..cb9c1929d7d 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -1941,6 +1941,11 @@ public:
return str;
}
+ void update_null_value()
+ {
+ execute();
+ }
+
virtual bool change_context_processor(uchar *cntx)
{ context= (Name_resolution_context *)cntx; return FALSE; }
@@ -1955,6 +1960,7 @@ public:
{
return sp_result_field;
}
+
bool check_vcol_func_processor(uchar *int_arg)
{
return trace_unsupported_by_check_vcol_func_processor(func_name());