diff options
| author | bell@sanja.is.com.ua <> | 2006-04-13 15:07:50 +0300 |
|---|---|---|
| committer | bell@sanja.is.com.ua <> | 2006-04-13 15:07:50 +0300 |
| commit | cb81389aef255b606cb262226d2721346ef567e2 (patch) | |
| tree | d096b4ad76ab8747e5598eb10f6c70cc55978bd0 /sql/item_func.cc | |
| parent | 34b2ed5f7f7889eb5f05c5bc8057bf8ae69aa796 (diff) | |
| parent | b4980d43830040ae950e36d7dc71398bf613a575 (diff) | |
| download | mariadb-git-cb81389aef255b606cb262226d2721346ef567e2.tar.gz | |
Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1
into sanja.is.com.ua:/home/bell/mysql/bk/work-5.0
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 f40f868f75f..e22a7b45f33 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -2462,11 +2462,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); } |