diff options
| author | gkodinov/kgeorge@rakia.gmz <> | 2006-11-28 15:47:53 +0200 |
|---|---|---|
| committer | gkodinov/kgeorge@rakia.gmz <> | 2006-11-28 15:47:53 +0200 |
| commit | fb41ec6f221bb05ae2e5a3ad60665242c696d496 (patch) | |
| tree | 3d1a267fd6979baf82fe7be97b67888c56e85298 /sql/item_sum.cc | |
| parent | 0421d489fbcdd1b9f3286f1981b7b3a275597b50 (diff) | |
| parent | 42cd956752be97efe01ed83825e5b320b98d56a3 (diff) | |
| download | mariadb-git-fb41ec6f221bb05ae2e5a3ad60665242c696d496.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
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 c2219aafd03..3fd3535ae83 100644 --- a/sql/item_sum.cc +++ b/sql/item_sum.cc @@ -1050,7 +1050,7 @@ bool Item_sum_count::add() count++; else { - (void) args[0]->val_int(); + args[0]->update_null_value(); if (!args[0]->null_value) count++; } @@ -1957,7 +1957,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; } @@ -2067,7 +2067,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++; } @@ -2547,7 +2547,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; } |