summaryrefslogtreecommitdiff
path: root/sql/item_func.h
diff options
context:
space:
mode:
authorigreenhoe/greenman@anubis.greendragongames.com <>2006-07-13 16:35:25 -0700
committerigreenhoe/greenman@anubis.greendragongames.com <>2006-07-13 16:35:25 -0700
commitabb75129f8318564be9730cb0b909702df9816ef (patch)
treeade4a3fc40348d0802ec1bbd31d554eaa91edfd3 /sql/item_func.h
parent878107eb4a232cf5097601bec3fa1e8c28d7aca6 (diff)
parentb4c8f536619d594326cdb7b9eade41262670358e (diff)
downloadmariadb-git-abb75129f8318564be9730cb0b909702df9816ef.tar.gz
4.1 -> 5.0 merge
Diffstat (limited to 'sql/item_func.h')
-rw-r--r--sql/item_func.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/item_func.h b/sql/item_func.h
index 2ca4be9f3f2..c54fc701c53 100644
--- a/sql/item_func.h
+++ b/sql/item_func.h
@@ -156,7 +156,10 @@ public:
{
return (null_value=args[0]->get_time(ltime));
}
- bool is_null() { (void) val_int(); return null_value; }
+ bool is_null() {
+ (void) val_int(); /* Discard result. It sets null_value as side-effect. */
+ return null_value;
+ }
void signal_divide_by_null();
friend class udf_handler;
Field *tmp_table_field() { return result_field; }