diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 11:48:44 +0100 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-29 11:48:44 +0100 |
| commit | 3e0d5bc27aa88da7539d996efc3a15636d5c4bda (patch) | |
| tree | 705a3f2438bde34c000204acb02832c960c8b9bc /sql/item_sum.h | |
| parent | a73e04bb8e423bba34e4ecafa68b40bb4c28512b (diff) | |
| parent | 6c0ff6c236ce096061f3db181e1469917781731d (diff) | |
| download | mariadb-git-3e0d5bc27aa88da7539d996efc3a15636d5c4bda.tar.gz | |
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-opt
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.1-opt
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/func_group.result:
Auto merged
mysql-test/r/group_min_max.result:
Auto merged
mysql-test/r/type_varchar.result:
Auto merged
mysql-test/t/group_min_max.test:
Auto merged
mysql-test/t/type_varchar.test:
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/opt_range.cc:
Auto merged
sql/sql_string.h:
Auto merged
sql/field.cc:
SCCS merged
Diffstat (limited to 'sql/item_sum.h')
| -rw-r--r-- | sql/item_sum.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item_sum.h b/sql/item_sum.h index a4cd078b98b..acd23d1ff4c 100644 --- a/sql/item_sum.h +++ b/sql/item_sum.h @@ -618,7 +618,7 @@ public: double val_real(); longlong val_int(); my_decimal *val_decimal(my_decimal *); - bool is_null() { (void) val_int(); return null_value; } + bool is_null() { update_null_value(); return null_value; } String *val_str(String*); enum_field_types field_type() const { @@ -685,7 +685,7 @@ public: { /* can't be fix_fields()ed */ return (longlong) rint(val_real()); } String *val_str(String*); my_decimal *val_decimal(my_decimal *); - bool is_null() { (void) val_int(); return null_value; } + bool is_null() { update_null_value(); return null_value; } enum_field_types field_type() const { return hybrid_type == DECIMAL_RESULT ? |