summaryrefslogtreecommitdiff
path: root/sql/sql_select.cc
diff options
context:
space:
mode:
authorunknown <konstantin@mysql.com>2004-11-11 21:39:35 +0300
committerunknown <konstantin@mysql.com>2004-11-11 21:39:35 +0300
commit2e6fb936e8ad2ab2dcd26176640a9d43ee7abc26 (patch)
treed65c1d25b2742712e5c398191b3e7eb40d0692e6 /sql/sql_select.cc
parent7ecaf256564b2b540f31e6080348e9e9c76ab261 (diff)
downloadmariadb-git-2e6fb936e8ad2ab2dcd26176640a9d43ee7abc26.tar.gz
Rename: Item::val -> Item::val_real().
sql/filesort.cc: val -> val_real sql/item.cc: val -> val_real sql/item.h: val -> val_real sql/item_buff.cc: val -> val_real sql/item_cmpfunc.cc: val -> val_real sql/item_cmpfunc.h: val -> val_real sql/item_func.cc: val -> val_real sql/item_func.h: val -> val_real sql/item_geofunc.cc: val -> val_real sql/item_geofunc.h: val -> val_real sql/item_row.h: val -> val_real sql/item_strfunc.cc: val -> val_real sql/item_strfunc.h: val -> val_real sql/item_subselect.cc: val -> val_real sql/item_subselect.h: val -> val_real sql/item_sum.cc: val -> val_real sql/item_sum.h: val -> val_real sql/item_timefunc.h: val -> val_real sql/item_uniq.h: val -> val_real sql/procedure.h: val -> val_real sql/sp_head.cc: val -> val_real sql/sql_analyse.cc: val -> val_real sql/sql_class.cc: val -> val_real sql/sql_select.cc: val -> val_real
Diffstat (limited to 'sql/sql_select.cc')
-rw-r--r--sql/sql_select.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index 89edc06139c..d07e274b0b7 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -2936,14 +2936,14 @@ add_ft_keys(DYNAMIC_ARRAY *keyuse_array,
Item_func *arg0=(Item_func *)(func->arguments()[0]),
*arg1=(Item_func *)(func->arguments()[1]);
if (arg1->const_item() &&
- ((functype == Item_func::GE_FUNC && arg1->val()> 0) ||
- (functype == Item_func::GT_FUNC && arg1->val()>=0)) &&
+ ((functype == Item_func::GE_FUNC && arg1->val_real() > 0) ||
+ (functype == Item_func::GT_FUNC && arg1->val_real() >=0)) &&
arg0->type() == Item::FUNC_ITEM &&
arg0->functype() == Item_func::FT_FUNC)
cond_func=(Item_func_match *) arg0;
else if (arg0->const_item() &&
- ((functype == Item_func::LE_FUNC && arg0->val()> 0) ||
- (functype == Item_func::LT_FUNC && arg0->val()>=0)) &&
+ ((functype == Item_func::LE_FUNC && arg0->val_real() > 0) ||
+ (functype == Item_func::LT_FUNC && arg0->val_real() >=0)) &&
arg1->type() == Item::FUNC_ITEM &&
arg1->functype() == Item_func::FT_FUNC)
cond_func=(Item_func_match *) arg1;