summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <evgen@moonbone.local>2006-08-24 23:16:54 +0400
committerunknown <evgen@moonbone.local>2006-08-24 23:16:54 +0400
commit84a653934513f396df49f26b16843efe378b81d5 (patch)
treee9e25c5394352e3a0da22932d661b4b0bdbe299f
parentd0394c70708055af5a5914154b1692ba517115f6 (diff)
downloadmariadb-git-84a653934513f396df49f26b16843efe378b81d5.tar.gz
opt_range.cc:
Corrected fix for bug#18165 sql/opt_range.cc: Corrected fix for bug#18165
-rw-r--r--sql/opt_range.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/opt_range.cc b/sql/opt_range.cc
index 9a836705bb9..ae55210ead7 100644
--- a/sql/opt_range.cc
+++ b/sql/opt_range.cc
@@ -3586,8 +3586,7 @@ static SEL_TREE *get_func_mm_tree(PARAM *param, Item_func *cond_func,
case Item_func::BETWEEN:
{
- int i= (int ) value;
- if (! i)
+ if (!value)
{
if (inv)
{
@@ -3610,8 +3609,8 @@ static SEL_TREE *get_func_mm_tree(PARAM *param, Item_func *cond_func,
else
tree= get_mm_parts(param, cond_func, field,
(inv ?
- (i == 1 ? Item_func::GT_FUNC : Item_func::LT_FUNC) :
- (i == 1 ? Item_func::LE_FUNC : Item_func::GE_FUNC)),
+ (value == 1 ? Item_func::GT_FUNC : Item_func::LT_FUNC) :
+ (value == 1 ? Item_func::LE_FUNC : Item_func::GE_FUNC)),
cond_func->arguments()[0], cmp_type);
break;
}