database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.0

Browse Source 
into mysql.r18.ru:/usr/home/ram/work/4.0
This commit is contained in:
unknown
2003-07-14 12:40:13 +05:00
parent 3611f70a25 e45b9ab481
commit c4daa71614
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_set.result
View File

@ -27,4 +27,4 @@ find_in_set("abc","abc") find_in_set("ab","abc") find_in_set("abcd","abc")
1 0 0 1 0 0
select interval(null, 1, 10, 100); select interval(null, 1, 10, 100);
interval(null, 1, 10, 100) interval(null, 1, 10, 100)
NULL -1

7
sql/item_cmpfunc.cc
View File

@ -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 0 if lower than lowest
1 - arg_count if between args[n] and args[n+1] 1 - arg_count if between args[n] and args[n+1]
arg_count+1 if higher than biggest argument arg_count+1 if higher than biggest argument
@ -321,10 +321,7 @@ longlong Item_func_interval::val_int()
{ {
double value= item->val(); double value= item->val();
if (item->null_value) if (item->null_value)
{ return -1; // -1 if NULL
null_value= 1;
return -1;
}
if (intervals) if (intervals)
{ // Use binary search to find interval { // Use binary search to find interval
uint start= 0, end= arg_count - 1; uint start= 0, end= arg_count - 1;