summaryrefslogtreecommitdiff
path: root/sql/item_func.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-01-16 17:38:38 +0200
committerGeorgi Kodinov <joro@sun.com>2009-01-16 17:38:38 +0200
commit4d8e73c8186e13d2136d15716cfeaedc55965e05 (patch)
treef0b8464ee2d3fcb57c8c4fe4de1ec5a91e090f3d /sql/item_func.cc
parent47bd8d19fd9a6eb8d6a314452db4a916a84adae9 (diff)
parentbdec5458aebded82d52cb535810ad73be244b690 (diff)
downloadmariadb-git-4d8e73c8186e13d2136d15716cfeaedc55965e05.tar.gz
merged 5.0-bugteam -> 5.1-bugteam
Diffstat (limited to 'sql/item_func.cc')
-rw-r--r--sql/item_func.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc
index 3cf1671bfa7..ff0c22ecfa9 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -4307,6 +4307,15 @@ my_decimal *Item_func_set_user_var::val_decimal_result(my_decimal *val)
}
+bool Item_func_set_user_var::is_null_result()
+{
+ DBUG_ASSERT(fixed == 1);
+ check(TRUE);
+ update(); // Store expression
+ return is_null();
+}
+
+
void Item_func_set_user_var::print(String *str, enum_query_type query_type)
{
str->append(STRING_WITH_LEN("(@"));