1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-opt

Browse Source 
into moonbone.local:/work/16377-4.1-after
This commit is contained in:
evgen@moonbone.local 2006-06-15 16:41:26 +04:00
commit d22c082b87
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -192,7 +192,7 @@ cast("2001-1-1" as datetime) = "2001-01-01 00:00:00"
1
select cast("1:2:3" as TIME) = "1:02:03";
cast("1:2:3" as TIME) = "1:02:03"
1
0
select cast(NULL as DATE);
cast(NULL as DATE)
NULL

15
sql/item_cmpfunc.h
View File

@ -43,11 +43,8 @@ public:
int set_compare_func(Item_bool_func2 *owner, Item_result type);
inline int set_compare_func(Item_bool_func2 *owner_arg)
{
Item_result ar= (*a)->result_as_longlong() && (*b)->const_item() ?
INT_RESULT : (*a)->result_type();
Item_result br= (*b)->result_as_longlong() && (*a)->const_item() ?
INT_RESULT : (*b)->result_type();
return set_compare_func(owner_arg, item_cmp_type(ar, br));
return set_compare_func(owner_arg, item_cmp_type((*a)->result_type(),
(*b)->result_type()));
}
inline int set_cmp_func(Item_bool_func2 *owner_arg,
Item **a1, Item **a2,
@ -60,11 +57,9 @@ public:
inline int set_cmp_func(Item_bool_func2 *owner_arg,
Item **a1, Item **a2)
{
Item_result ar= (*a1)->result_as_longlong() && (*a2)->const_item() ?
INT_RESULT : (*a1)->result_type();
Item_result br= (*a2)->result_as_longlong() && (*a1)->const_item() ?
INT_RESULT : (*a2)->result_type();
return set_cmp_func(owner_arg, a1, a2, item_cmp_type(ar, br));
return set_cmp_func(owner_arg, a1, a2,
item_cmp_type((*a1)->result_type(),
(*a2)->result_type()));
}
inline int compare() { return (this->*func)(); }