diff options
| author | ram@mysql.r18.ru <> | 2003-07-14 12:40:13 +0500 |
|---|---|---|
| committer | ram@mysql.r18.ru <> | 2003-07-14 12:40:13 +0500 |
| commit | 60c0fb7b4f14b15092181db7ff409512a08cdc1c (patch) | |
| tree | 3361cc9ad02c0eb23655f6ccb0fca72a7849da37 | |
| parent | 568e050ec9352d710a30b8927f4a3406ab0f925e (diff) | |
| parent | 8e23f54fec343e7dcfb20890d6c444ada96619de (diff) | |
| download | mariadb-git-60c0fb7b4f14b15092181db7ff409512a08cdc1c.tar.gz | |
Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.r18.ru:/usr/home/ram/work/4.0
| -rw-r--r-- | mysql-test/r/func_set.result | 2 | ||||
| -rw-r--r-- | sql/item_cmpfunc.cc | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/mysql-test/r/func_set.result b/mysql-test/r/func_set.result index dfd7750adaf..eeeb216d142 100644 --- a/mysql-test/r/func_set.result +++ b/mysql-test/r/func_set.result @@ -27,4 +27,4 @@ find_in_set("abc","abc") find_in_set("ab","abc") find_in_set("abcd","abc") 1 0 0 select interval(null, 1, 10, 100); interval(null, 1, 10, 100) -NULL +-1 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; |