diff options
| author | unknown <gkodinov@dl145s.mysql.com> | 2006-11-30 12:22:32 +0100 |
|---|---|---|
| committer | unknown <gkodinov@dl145s.mysql.com> | 2006-11-30 12:22:32 +0100 |
| commit | 6e791795a2d7319e32a65a4d8a2cb6ed54cfc5c6 (patch) | |
| tree | 352aa848a2fdf6a068b074e57e86b9bb35acf173 /sql/item_sum.cc | |
| parent | 4ec847218dca3fa31d6b7d61fffdf71c444c1c74 (diff) | |
| parent | ef42631b5379254fc41fa42a2a75e23dd4fc1f64 (diff) | |
| download | mariadb-git-6e791795a2d7319e32a65a4d8a2cb6ed54cfc5c6.tar.gz | |
Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0
into dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-opt
mysql-test/r/ps.result:
Auto merged
mysql-test/t/ps.test:
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 4d84fa20300..6d34712ed1a 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1054,7 +1054,7 @@ bool Item_sum_count::add() count++; else { - (void) args[0]->val_int(); + args[0]->update_null_value(); if (!args[0]->null_value) count++; } @@ -1961,7 +1961,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; } @@ -2071,7 +2071,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++; } @@ -2551,7 +2551,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; } |