diff options
| author | unknown <gkodinov/kgeorge@rakia.gmz> | 2006-11-28 15:47:53 +0200 |
|---|---|---|
| committer | unknown <gkodinov/kgeorge@rakia.gmz> | 2006-11-28 15:47:53 +0200 |
| commit | bce65bf41b4be9d859d7c1cf7ddcbca3e2d8deaf (patch) | |
| tree | 3d1a267fd6979baf82fe7be97b67888c56e85298 /sql/item_func.h | |
| parent | c0f63d8564fdd1aacd001a882271dd896721d93a (diff) | |
| parent | 9221a5482bb39be7391f46d81e1e85dc41b47729 (diff) | |
| download | mariadb-git-bce65bf41b4be9d859d7c1cf7ddcbca3e2d8deaf.tar.gz | |
Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into rakia.gmz:/home/kgeorge/mysql/autopush/B11927-5.0-opt
mysql-test/r/func_gconcat.result:
Auto merged
sql/field.cc:
Auto merged
sql/item.cc:
Auto merged
sql/item.h:
Auto merged
sql/item_func.h:
Auto merged
sql/item_subselect.h:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_sum.h:
Auto merged
sql/sql_string.h:
Auto merged
Diffstat (limited to 'sql/item_func.h')
| -rw-r--r-- | sql/item_func.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_func.h b/sql/item_func.h index 9d94bc85d2c..ca835177f18 100644 --- a/sql/item_func.h +++ b/sql/item_func.h @@ -157,7 +157,7 @@ public: return (null_value=args[0]->get_time(ltime)); } bool is_null() { - (void) val_int(); /* Discard result. It sets null_value as side-effect. */ + update_null_value(); return null_value; } void signal_divide_by_null(); @@ -241,7 +241,7 @@ public: virtual double real_op()= 0; virtual my_decimal *decimal_op(my_decimal *)= 0; virtual String *str_op(String *)= 0; - bool is_null() { (void) val_real(); return null_value; } + bool is_null() { update_null_value(); return null_value; } }; /* function where type of result detected by first argument */ |