Merge

sql/field.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/handler.cc:
  SCCS merged

1 files changed, 2 insertions, 2 deletions

diff --git a/sql/field.cc b/sql/field.cc
index 4ef80a99695..cfda1ab29fc 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -3230,13 +3230,13 @@ int Field_long::store(const char *from,uint len,CHARSET_INFO *cs)
   long store_tmp;
   int error;
   char *end;
-  
+
   tmp_scan= cs->cset->scan(cs, from, from+len, MY_SEQ_SPACES);
   len-= tmp_scan;
   from+= tmp_scan;
 
   end= (char*) from+len;
-  tmp= cs->cset->my_strtoll10(cs, from, &end, &error);
+  tmp= cs->cset->strtoll10(cs, from, &end, &error);
 
   if (error != MY_ERRNO_EDOM)
   {