Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge


mysql-test/t/func_misc.test:
  Auto merged
sql/field.cc:
  Auto merged
sql/item_create.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sp_head.cc:
  Auto merged
sql/sp_head.h:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_lex.h:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
strings/ctype-ujis.c:
  Auto merged

1 files changed, 4 insertions, 3 deletions

diff --git a/strings/strtod.c b/strings/strtod.c
index 7196cafb2c9..868fddd9eb4 100644
--- a/strings/strtod.c
+++ b/strings/strtod.c
@@ -56,7 +56,8 @@ static double scaler1[] = {
 double my_strtod(const char *str, char **end_ptr, int *error)
 {
   double result= 0.0;
-  uint negative= 0, ndigits, dec_digits= 0, neg_exp= 0;
+  uint negative= 0, neg_exp= 0;
+  size_t ndigits, dec_digits= 0;
   int exponent= 0, digits_after_dec_point= 0, tmp_exp;
   const char *old_str, *end= *end_ptr, *start_of_number;
   char next_char;
@@ -100,7 +101,7 @@ double my_strtod(const char *str, char **end_ptr, int *error)
     }
     start_of_number= 0;                         /* Found digit */
   }
-  ndigits= (uint) (str-old_str);
+  ndigits= (size_t) (str-old_str);
 
   if (next_char == '.' && str < end-1)
   {
@@ -124,7 +125,7 @@ double my_strtod(const char *str, char **end_ptr, int *error)
       }
     }
     /* If we found just '+.' or '.' then point at first character */
-    if (!(dec_digits= (uint) (str-old_str)) && start_of_number)
+    if (!(dec_digits= (size_t) (str-old_str)) && start_of_number)
       str= start_of_number;                     /* Point at '+' or '.' */
   }
   if ((next_char == 'e' || next_char == 'E') &&