Conflicts resolving

BitKeeper/etc/logging_ok:
  auto-union
client/mysql.cc:
  Auto merged
client/mysqltest.c:
  Auto merged
include/my_global.h:
  Auto merged
include/mysql.h:
  Auto merged
include/mysql_com.h:
  Auto merged
sql/field.cc:
  Auto merged
sql/field.h:
  Auto merged
sql/ha_innodb.cc:
  Auto merged
sql/item.cc:
  Auto merged
sql/item.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_strfunc.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
sql/protocol.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/set_var.h:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_db.cc:
  Auto merged
sql/sql_handler.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_prepare.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
libmysqld/libmysqld.c:
  conflicts resolving

1 files changed, 10 insertions, 4 deletions

diff --git a/sql/item.h b/sql/item.h
index 0a236189063..09882b26724 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -344,13 +344,15 @@ public:
   enum Type type() const { return STRING_ITEM; }
   double val()
   { 
+    int err;
     return my_strntod(str_value.charset(), (char*) str_value.ptr(),
-		      str_value.length(), (char**) 0);
+		      str_value.length(), (char**) 0, &err);
   }
   longlong val_int()
   {
+    int err;
     return my_strntoll(str_value.charset(), str_value.ptr(),
-		       str_value.length(), (char**) 0, 10);
+		       str_value.length(), 10, (char**) 0, &err);
   }
   String *val_str(String*) { return (String*) &str_value; }
   int save_in_field(Field *field, bool no_conversions);
@@ -599,12 +601,16 @@ public:
   enum_field_types field_type() const { return cached_field_type; }
   double val()
   {
+    int err;
     return (null_value ? 0.0 :
 	    my_strntod(str_value.charset(), (char*) str_value.ptr(),
-		       str_value.length(),NULL));
+		       str_value.length(),NULL,&err));
   }
   longlong val_int()
-  { return null_value ? LL(0) : my_strntoll(str_value.charset(),str_value.ptr(),str_value.length(),(char**) 0,10); }
+  { 
+    int err;
+    return null_value ? LL(0) : my_strntoll(str_value.charset(),str_value.ptr(),str_value.length(),10, (char**) 0,&err); 
+  }
   String *val_str(String*);
   void make_field(Send_field *field) { item->make_field(field); }
   void copy();