diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-30 12:27:04 +0100 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-30 12:27:04 +0100 |
| commit | dbc352817ea34cce6bbd7066c0688c99f5dc24ab (patch) | |
| tree | d78e45d0e0dedf887d221c2b3da4a43ac1d9f778 /sql/item_sum.cc | |
| parent | f513b9744163601047e71af82bd399d9e8d5884f (diff) | |
| parent | 5dc1d382ca40e0cebbbc82487b197b1f034921e1 (diff) | |
| download | mariadb-git-dbc352817ea34cce6bbd7066c0688c99f5dc24ab.tar.gz | |
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.1
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.1-opt
mysql-test/r/func_in.result:
Auto merged
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_sum.cc:
Auto merged
Diffstat (limited to 'sql/item_sum.cc')
| -rw-r--r-- | sql/item_sum.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_sum.cc b/sql/item_sum.cc index cfa4b2ce16c..1ac872b6c07 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1064,7 +1064,7 @@ bool Item_sum_count::add() count++; else { - (void) args[0]->val_int(); + args[0]->update_null_value(); if (!args[0]->null_value) count++; } @@ -1980,7 +1980,7 @@ void Item_sum_count::reset_field() nr=1; else { - (void) args[0]->val_int(); + args[0]->update_null_value(); if (!args[0]->null_value) nr=1; } @@ -2090,7 +2090,7 @@ void Item_sum_count::update_field() nr++; else { - (void) args[0]->val_int(); + args[0]->update_null_value(); if (!args[0]->null_value) nr++; } @@ -2570,7 +2570,7 @@ bool Item_sum_count_distinct::setup(THD *thd) return TRUE; // End of memory if (item->const_item()) { - (void) item->val_int(); + item->update_null_value(); if (item->null_value) always_null=1; } |