Merge work:/home/bk/mysql-4.1

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1

1 files changed, 8 insertions, 10 deletions

diff --git a/sql/field.cc b/sql/field.cc
index de42b8f8655..0fa306fe718 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1652,11 +1652,10 @@ int Field_long::store(const char *from,uint len,CHARSET_INFO *cs)
   long tmp;
   int error= 0;
   char *end;
-  /* TODO: Make multi-byte-character safe */
-  while (len && my_isspace(cs,*from))
-  {
-    len--; from++;
-  }
+  
+  tmp= cs->scan(cs, from, from+len, MY_SEQ_SPACES);
+  len-= tmp;
+  from+= tmp;
   my_errno=0;
   if (unsigned_flag)
   {
@@ -1910,11 +1909,10 @@ int Field_longlong::store(const char *from,uint len,CHARSET_INFO *cs)
   longlong tmp;
   int error= 0;
   char *end;
-  /* TODO:  Make multi byte safe */
-  while (len && my_isspace(cs,*from))
-  {						// For easy error check
-    len--; from++;
-  }
+  
+  tmp= cs->scan(cs, from, from+len, MY_SEQ_SPACES);
+  len-= tmp;
+  from+= tmp;
   my_errno=0;
   if (unsigned_flag)
   {