diff options
| author | bell@sanja.is.com.ua <> | 2006-04-24 13:32:07 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2006-04-24 13:32:07 +0300 |
| commit | b2c810e8475c43c85472b2a3e3074cb36c69d20e (patch) | |
| tree | b4b53f9873d5ee576a5ea0a905753163cd7fc022 /sql/item_func.cc | |
| parent | 92a8da8b188e1cf363d89889471a6998b14d6aea (diff) | |
| parent | 5c7955bd54ecd4a686614d38470e79e9fef4872a (diff) | |
| download | mariadb-git-b2c810e8475c43c85472b2a3e3074cb36c69d20e.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0
into sanja.is.com.ua:/home/bell/mysql/bk/work-merge-5.1
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 22157319d99..efaf4071066 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2489,11 +2489,8 @@ longlong Item_func_bit_count::val_int() { DBUG_ASSERT(fixed == 1); ulonglong value= (ulonglong) args[0]->val_int(); - if (args[0]->null_value) - { - null_value=1; /* purecov: inspected */ + if ((null_value= args[0]->null_value)) return 0; /* purecov: inspected */ - } return (longlong) my_count_bits(value); } |