diff options
| author | unknown <ram@mysql.r18.ru> | 2003-07-14 12:40:13 +0500 |
|---|---|---|
| committer | unknown <ram@mysql.r18.ru> | 2003-07-14 12:40:13 +0500 |
| commit | c4daa7161431dfb6258d2ac9b9effb8d2208b64b (patch) | |
| tree | 3361cc9ad02c0eb23655f6ccb0fca72a7849da37 /sql | |
| parent | 3611f70a25ac3ff4325cf0588c594442bdc86525 (diff) | |
| parent | e45b9ab481b26a8da6aa508437325ef7f00fb55f (diff) | |
| download | mariadb-git-c4daa7161431dfb6258d2ac9b9effb8d2208b64b.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.r18.ru:/usr/home/ram/work/4.0
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/item_cmpfunc.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc index 731f9b61438..8c58c58a67d 100644 --- a/sql/item_cmpfunc.cc +++ b/sql/item_cmpfunc.cc @@ -311,7 +311,7 @@ void Item_func_interval::split_sum_func(List<Item> &fields) } /* - return NULL if null value, + return -1 if null value, 0 if lower than lowest 1 - arg_count if between args[n] and args[n+1] arg_count+1 if higher than biggest argument @@ -321,10 +321,7 @@ longlong Item_func_interval::val_int() { double value= item->val(); if (item->null_value) - { - null_value= 1; - return -1; - } + return -1; // -1 if NULL if (intervals) { // Use binary search to find interval uint start= 0, end= arg_count - 1; |