From 2e6fb936e8ad2ab2dcd26176640a9d43ee7abc26 Mon Sep 17 00:00:00 2001
From: unknown <konstantin@mysql.com>
Date: Thu, 11 Nov 2004 21:39:35 +0300
Subject: 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
---
 sql/item_geofunc.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'sql/item_geofunc.cc')

diff --git a/sql/item_geofunc.cc b/sql/item_geofunc.cc
index 7c3319bbfea..163260f6428 100644
--- a/sql/item_geofunc.cc
+++ b/sql/item_geofunc.cc
@@ -320,8 +320,8 @@ err:
 String *Item_func_point::val_str(String *str)
 {
   DBUG_ASSERT(fixed == 1);
-  double x= args[0]->val();
-  double y= args[1]->val();
+  double x= args[0]->val_real();
+  double y= args[1]->val_real();
 
   if ((null_value= (args[0]->null_value ||
 		    args[1]->null_value ||
@@ -628,7 +628,7 @@ longlong Item_func_numpoints::val_int()
 }
 
 
-double Item_func_x::val()
+double Item_func_x::val_real()
 {
   DBUG_ASSERT(fixed == 1);
   double res= 0.0;				// In case of errors
@@ -645,7 +645,7 @@ double Item_func_x::val()
 }
 
 
-double Item_func_y::val()
+double Item_func_y::val_real()
 {
   DBUG_ASSERT(fixed == 1);
   double res= 0;				// In case of errors
@@ -662,7 +662,7 @@ double Item_func_y::val()
 }
 
 
-double Item_func_area::val()
+double Item_func_area::val_real()
 {
   DBUG_ASSERT(fixed == 1);
   double res= 0;				// In case of errors
@@ -679,7 +679,7 @@ double Item_func_area::val()
   return res;
 }
 
-double Item_func_glength::val()
+double Item_func_glength::val_real()
 {
   DBUG_ASSERT(fixed == 1);
   double res= 0;				// In case of errors
-- 
cgit v1.2.1