my_atof is deleted

strtod from mit-threads is restored and cleaned up


BitKeeper/deleted/.del-atof.c~d3edf47a9884080:
  Delete: strings/atof.c
configure.in:
  atod() is no longer used in MySQL
  isinf() now is
include/m_string.h:
  my_strtod, my_atof
include/my_global.h:
  my_atof is deleted
  define isinf()
libmysql/Makefile.shared:
  use internal strtod
sql/gstream.cc:
  use internal strtod
sql/init.cc:
  my_atof is deleted
sql/item.h:
  use internal strtod
sql/item_func.cc:
  use internal strtod
sql/item_sum.h:
  use internal strtod
sql/sql_analyse.cc:
  use internal strtod
strings/Makefile.am:
  use internal strtod
strings/ctype-simple.c:
  use internal strtod
strings/ctype-ucs2.c:
  use internal strtod
strings/strtod.c:
  cleanup
  stricter input checks (e.g. ".E10" is no longer a number)
  don't return an "inf"

6 files changed, 6 insertions, 9 deletions

diff --git a/sql/gstream.cc b/sql/gstream.cc
index a97ed9cae03..17b85af22bd 100644
--- a/sql/gstream.cc
+++ b/sql/gstream.cc
@@ -101,7 +101,7 @@ int GTextReadStream::get_next_number(double *d)
 
   char *endptr;
 
-  *d = strtod(cur, &endptr);
+  *d = my_strtod(cur, &endptr);
 
   if (endptr)
   {
diff --git a/sql/init.cc b/sql/init.cc
index 033dfd72843..084db57f8aa 100644
--- a/sql/init.cc
+++ b/sql/init.cc
@@ -34,9 +34,6 @@ void unireg_init(ulong options)
 
   current_pid=(ulong) getpid();		/* Save for later ref */
   init_time();				/* Init time-functions (read zone) */
-#ifdef USE_MY_ATOF
-  init_my_atof();			/* use our atof */
-#endif
 #ifndef EMBEDDED_LIBRARY
   my_abort_hook=unireg_abort;		/* Abort with close of databases */
 #endif
diff --git a/sql/item.h b/sql/item.h
index 7b5c506079d..6487c8d8391 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -441,7 +441,7 @@ class Item_real :public Item
 public:
   const double value;
   // Item_real() :value(0) {}
-  Item_real(const char *str_arg,uint length) :value(atof(str_arg))
+  Item_real(const char *str_arg,uint length) :value(my_atof(str_arg))
   {
     name=(char*) str_arg;
     decimals=(uint8) nr_of_decimals(str_arg);
diff --git a/sql/item_func.cc b/sql/item_func.cc
index f90fcd5149e..42f0e64c71b 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -2255,7 +2255,7 @@ double user_var_entry::val(my_bool *null_value)
   case INT_RESULT:
     return (double) *(longlong*) value;
   case STRING_RESULT:
-    return atof(value);				// This is null terminated
+    return my_atof(value);                      // This is null terminated
   case ROW_RESULT:
     DBUG_ASSERT(1);				// Impossible
     break;
diff --git a/sql/item_sum.h b/sql/item_sum.h
index dc84e4d4ab7..1435128af33 100644
--- a/sql/item_sum.h
+++ b/sql/item_sum.h
@@ -735,7 +735,7 @@ class Item_func_group_concat : public Item_sum
 
   enum Sumfunctype sum_func () const {return GROUP_CONCAT_FUNC;}
   const char *func_name() const { return "group_concat"; }
-  enum Type type() const { return SUM_FUNC_ITEM; }  
+  enum Type type() const { return SUM_FUNC_ITEM; }
   virtual Item_result result_type () const { return STRING_RESULT; }
   void clear();
   bool add();
@@ -747,7 +747,7 @@ class Item_func_group_concat : public Item_sum
   double val()
   {
     String *res;  res=val_str(&str_value);
-    return res ? atof(res->c_ptr()) : 0.0;
+    return res ? my_atof(res->c_ptr()) : 0.0;
   }
   longlong val_int()
   {
diff --git a/sql/sql_analyse.cc b/sql/sql_analyse.cc
index 9e73e06d9c6..3c9563165fe 100644
--- a/sql/sql_analyse.cc
+++ b/sql/sql_analyse.cc
@@ -225,7 +225,7 @@ bool test_if_number(NUM_INFO *info, const char *str, uint str_len)
       info->decimals++;
     if (str == end)
     {
-      info->dval = atod(begin);
+      info->dval = my_atof(begin);
       return 1;
     }
   }