fixes for windows 64-bit compiler warnings

heap/hp_hash.c:
  fix for windows 64-bit compiler warnings
heap/hp_update.c:
  fix for windows 64-bit compiler warnings
mysys/default.c:
  fix for windows 64-bit compiler warnings
mysys/default_modify.c:
  fix for windows 64-bit compiler warnings
mysys/mf_iocache.c:
  fix for windows 64-bit compiler warnings
mysys/mf_keycache.c:
  fix for windows 64-bit compiler warnings
mysys/my_alloc.c:
  fix for windows 64-bit compiler warnings
mysys/my_getopt.c:
  fix for windows 64-bit compiler warnings
mysys/my_mmap.c:
  fix for windows 64-bit compiler warnings
mysys/my_once.c:
  fix for windows 64-bit compiler warnings
mysys/string.c:
  fix for windows 64-bit compiler warnings
sql-common/client.c:
  fix for windows 64-bit compiler warnings
sql/field.cc:
  fix for windows 64-bit compiler warnings
sql/gstream.cc:
  fix for windows 64-bit compiler warnings
sql/ha_myisam.cc:
  fix for windows 64-bit compiler warnings
sql/ha_myisammrg.cc:
  fix for windows 64-bit compiler warnings
sql/item.cc:
  fix for windows 64-bit compiler warnings
sql/item.h:
  fix for windows 64-bit compiler warnings
sql/item_cmpfunc.cc:
  fix for windows 64-bit compiler warnings
sql/password.c:
  fix for windows 64-bit compiler warnings
sql/set_var.h:
  fix for windows 64-bit compiler warnings
strings/ctype-big5.c:
  fix for windows 64-bit compiler warnings
strings/ctype-bin.c:
  fix for windows 64-bit compiler warnings
strings/ctype-cp932.c:
  fix for windows 64-bit compiler warnings
strings/ctype-eucjpms.c:
  fix for windows 64-bit compiler warnings
strings/ctype-mb.c:
  fix for windows 64-bit compiler warnings
strings/ctype-simple.c:
  fix for windows 64-bit compiler warnings
strings/ctype-sjis.c:
  fix for windows 64-bit compiler warnings
strings/ctype-uca.c:
  fix for windows 64-bit compiler warnings
strings/ctype-ucs2.c:
  fix for windows 64-bit compiler warnings
strings/ctype-ujis.c:
  fix for windows 64-bit compiler warnings
strings/ctype-utf8.c:
  fix for windows 64-bit compiler warnings
strings/ctype.c:
  fix for windows 64-bit compiler warnings
strings/decimal.c:
  fix for windows 64-bit compiler warnings
strings/xml.c:
  fix for windows 64-bit compiler warnings

35 files changed, 119 insertions, 115 deletions

diff --git a/heap/hp_hash.c b/heap/hp_hash.c
index 7f02eb587a8..9e4636ebdc0 100644
--- a/heap/hp_hash.c
+++ b/heap/hp_hash.c
@@ -778,7 +778,7 @@ uint hp_rb_make_key(HP_KEYDEF *keydef, byte *key,
     key+= seg->length;
   }
   memcpy(key, &recpos, sizeof(byte*));
-  return key - start_key;
+  return (uint) (key - start_key);
 }
 
 
@@ -844,7 +844,7 @@ uint hp_rb_pack_key(HP_KEYDEF *keydef, uchar *key, const uchar *old,
     key+= seg->length;
     k_len-= seg->length;
   }
-  return key - start_key;
+  return (uint) (key - start_key);
 }
 
 
@@ -866,7 +866,7 @@ uint hp_rb_null_key_length(HP_KEYDEF *keydef, const byte *key)
       continue;
     key+= seg->length;
   }
-  return key - start_key;
+  return (uint) (key - start_key);
 }
                   
 
@@ -886,7 +886,7 @@ uint hp_rb_var_key_length(HP_KEYDEF *keydef, const byte *key)
     }
     key+= length;
   }
-  return key - start_key;
+  return (uint) (key - start_key);
 }
 
 
diff --git a/heap/hp_update.c b/heap/hp_update.c
index 2f4ea75f9aa..63ada225f06 100644
--- a/heap/hp_update.c
+++ b/heap/hp_update.c
@@ -60,7 +60,7 @@ int heap_update(HP_INFO *info, const byte *old, const byte *heap_new)
  err:
   if (my_errno == HA_ERR_FOUND_DUPP_KEY)
   {
-    info->errkey = keydef - share->keydef;
+    info->errkey = (int) (keydef - share->keydef);
     if (keydef->algorithm == HA_KEY_ALG_BTREE)
     {
       /* we don't need to delete non-inserted key from rb-tree */
diff --git a/mysys/default.c b/mysys/default.c
index ab9bdaf0ed2..cffd57c37f1 100644
--- a/mysys/default.c
+++ b/mysys/default.c
@@ -856,7 +856,7 @@ static void init_default_directories()
   /* Only add shared system directory if different from default. */
   if (GetSystemWindowsDirectory(shared_system_dir,sizeof(shared_system_dir)) &&
       strcmp(system_dir, shared_system_dir))
-    *ptr++= &shared_system_dir;
+    *ptr++= (char *)&shared_system_dir;
 #endif
 
 #elif defined(__NETWARE__)
diff --git a/mysys/default_modify.c b/mysys/default_modify.c
index 721ca596428..fe784c7a44b 100644
--- a/mysys/default_modify.c
+++ b/mysys/default_modify.c
@@ -58,8 +58,8 @@ int modify_defaults_file(const char *file_location, const char *option,
   if (my_fstat(fileno(cnf_file), &file_stat, MYF(0)))
     goto err;
 
-  optlen= strlen(option);
-  optval_len= strlen(option_value);
+  optlen= (uint) strlen(option);
+  optval_len= (uint) strlen(option_value);
 
   /*
     Reserve space to read the contents of the file and some more
@@ -79,7 +79,7 @@ int modify_defaults_file(const char *file_location, const char *option,
 					FN_REFLEN), MYF(MY_WME))))
     goto malloc_err;
 
-  sect_len= strlen(section_name);
+  sect_len= (uint) strlen(section_name);
 
   for (dst_ptr= file_buffer; fgets(linebuff, BUFF_SIZE, cnf_file); )
   {
diff --git a/mysys/mf_iocache.c b/mysys/mf_iocache.c
index a55a2d81c2c..b000af19aa0 100644
--- a/mysys/mf_iocache.c
+++ b/mysys/mf_iocache.c
@@ -601,7 +601,7 @@ int _my_b_read_r(register IO_CACHE *info, byte *Buffer, uint Count)
       info->error=          info->share->active->error;
       info->read_end=       info->share->active->read_end;
       info->pos_in_file=    info->share->active->pos_in_file;
-      len= (info->error == -1 ? -1 : info->read_end-info->buffer);
+      len= (int) (info->error == -1 ? -1 : info->read_end-info->buffer);
     }
     info->read_pos=info->buffer;
     info->seek_not_done=0;
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c
index feb9c77a5b9..cb2e0c98e8a 100644
--- a/mysys/mf_keycache.c
+++ b/mysys/mf_keycache.c
@@ -2191,7 +2191,7 @@ static int flush_cached_blocks(KEY_CACHE *keycache,
 {
   int error;
   int last_errno= 0;
-  uint count= end-cache;
+  uint count= (uint) (end-cache);
 
   /* Don't lock the cache during the flush */
   keycache_pthread_mutex_unlock(&keycache->cache_lock);
diff --git a/mysys/my_alloc.c b/mysys/my_alloc.c
index 4aa31829c59..619d6bd5654 100644
--- a/mysys/my_alloc.c
+++ b/mysys/my_alloc.c
@@ -333,7 +333,7 @@ void set_prealloc_root(MEM_ROOT *root, char *ptr)
 
 char *strdup_root(MEM_ROOT *root,const char *str)
 {
-  return strmake_root(root, str, strlen(str));
+  return strmake_root(root, str, (uint) strlen(str));
 }
 
 char *strmake_root(MEM_ROOT *root,const char *str, uint len)
diff --git a/mysys/my_getopt.c b/mysys/my_getopt.c
index 5e93ad56cb5..68bf65b2abe 100644
--- a/mysys/my_getopt.c
+++ b/mysys/my_getopt.c
@@ -180,7 +180,7 @@ int handle_options(int *argc, char ***argv,
 	}
 	opt_str= check_struct_option(cur_arg, key_name);
 	optend= strcend(opt_str, '=');
-	length= optend - opt_str;
+	length= (uint) (optend - opt_str);
 	if (*optend == '=')
 	  optend++;
 	else
@@ -323,7 +323,7 @@ int handle_options(int *argc, char ***argv,
 	  return EXIT_NO_ARGUMENT_ALLOWED;
 	}
 	value= optp->var_type & GET_ASK_ADDR ?
-	  (*getopt_get_addr)(key_name, strlen(key_name), optp) : optp->value;
+	  (*getopt_get_addr)(key_name, (uint) strlen(key_name), optp) : optp->value;
   
 	if (optp->arg_type == NO_ARG)
 	{
@@ -519,7 +519,7 @@ static char *check_struct_option(char *cur_arg, char *key_name)
   */
   if (end - ptr > 1)
   {
-    uint len= ptr - cur_arg;
+    uint len= (uint) (ptr - cur_arg);
     set_if_smaller(len, FN_REFLEN-1);
     strmake(key_name, cur_arg, len);
     return ++ptr;
@@ -833,7 +833,7 @@ void my_print_help(const struct my_option *options)
     if (strlen(optp->name))
     {
       printf("--%s", optp->name);
-      col+= 2 + strlen(optp->name);
+      col+= 2 + (uint) strlen(optp->name);
       if ((optp->var_type & GET_TYPE_MASK) == GET_STR ||
 	  (optp->var_type & GET_TYPE_MASK) == GET_STR_ALLOC)
       {
@@ -904,7 +904,7 @@ void my_print_variables(const struct my_option *options)
     if (value)
     {
       printf("%s", optp->name);
-      length= strlen(optp->name);
+      length= (uint) strlen(optp->name);
       for (; length < name_space; length++)
 	putchar(' ');
       switch ((optp->var_type & GET_TYPE_MASK)) {
diff --git a/mysys/my_mmap.c b/mysys/my_mmap.c
index cd84630a761..21bfddae46c 100644
--- a/mysys/my_mmap.c
+++ b/mysys/my_mmap.c
@@ -53,7 +53,7 @@ void *my_mmap(void *addr, size_t len, int prot,
   flProtect|=SEC_COMMIT;
 
   hFileMap=CreateFileMapping(hFile, &mmap_security_attributes,
-                             PAGE_READWRITE, 0, len, NULL);
+                             PAGE_READWRITE, 0, (DWORD) len, NULL);
   if (hFileMap == 0)
     return MAP_FAILED;
 
diff --git a/mysys/my_once.c b/mysys/my_once.c
index a4201810b03..ab5fcc51c0e 100644
--- a/mysys/my_once.c
+++ b/mysys/my_once.c
@@ -81,7 +81,7 @@ gptr my_once_alloc(unsigned int Size, myf MyFlags)
 
 char *my_once_strdup(const char *src,myf myflags)
 {
-  uint len=strlen(src)+1;
+  uint len= (uint) strlen(src)+1;
   char *dst=my_once_alloc(len, myflags);
   if (dst)
     memcpy(dst, src, len);
diff --git a/mysys/string.c b/mysys/string.c
index ea747bc9847..dfd42d137dd 100644
--- a/mysys/string.c
+++ b/mysys/string.c
@@ -91,7 +91,7 @@ my_bool dynstr_realloc(DYNAMIC_STRING *str, ulong additional_size)
 
 my_bool dynstr_append(DYNAMIC_STRING *str, const char *append)
 {
-  return dynstr_append_mem(str,append,strlen(append));
+  return dynstr_append_mem(str,append,(uint) strlen(append));
 }
 
 
diff --git a/sql-common/client.c b/sql-common/client.c
index 0bebcb0065d..c736acae857 100644
--- a/sql-common/client.c
+++ b/sql-common/client.c
@@ -2130,7 +2130,7 @@ CLI_MYSQL_REAL_CONNECT(MYSQL *mysql,const char *host, const char *user,
     for (; ptr<end; ptr++)
     {
       MYSQL_RES *res;
-      if (mysql_real_query(mysql,*ptr, strlen(*ptr)))
+      if (mysql_real_query(mysql,*ptr, (ulong) strlen(*ptr)))
 	goto error;
       if (mysql->fields)
       {
diff --git a/sql/field.cc b/sql/field.cc
index 89ef25475ff..acf3c0647cb 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1920,7 +1920,7 @@ int Field_decimal::store(const char *from, uint len, CHARSET_INFO *cs)
 	int_digits_added_zeros=0;
       }
     }
-    tmp_uint= (tmp_dec+(int_digits_end-int_digits_from)+
+    tmp_uint= (uint) (tmp_dec+(int_digits_end-int_digits_from)+
                (uint)(frac_digits_from-int_digits_tail_from)+
                int_digits_added_zeros);
   }
@@ -7734,9 +7734,9 @@ bool Field_enum::eq_def(Field *field)
   for (uint i=0 ; i < from_lib->count ; i++)
     if (my_strnncoll(field_charset,
                      (const uchar*)typelib->type_names[i],
-                     strlen(typelib->type_names[i]),
+                     (uint) strlen(typelib->type_names[i]),
                      (const uchar*)from_lib->type_names[i],
-                     strlen(from_lib->type_names[i])))
+                     (uint) strlen(from_lib->type_names[i])))
       return 0;
   return 1;
 }
@@ -8594,7 +8594,8 @@ Field::set_datetime_warning(MYSQL_ERROR::enum_warning_level level, uint code,
   {
     char str_nr[22];
     char *str_end= longlong10_to_str(nr, str_nr, -10);
-    make_truncated_value_warning(table->in_use, str_nr, str_end - str_nr, 
+    make_truncated_value_warning(table->in_use, str_nr, 
+                                 (uint) (str_end - str_nr), 
                                  ts_type, field_name);
   }
 }
diff --git a/sql/gstream.cc b/sql/gstream.cc
index f7d11d76b0c..4083cb2fe71 100644
--- a/sql/gstream.cc
+++ b/sql/gstream.cc
@@ -83,7 +83,7 @@ bool Gis_read_stream::get_next_number(double *d)
   }
 
   *d = my_strntod(m_charset, (char *)m_cur,
-		  m_limit-m_cur, &endptr, &err);
+		  (uint) (m_limit-m_cur), &endptr, &err);
   if (err)
     return 1;
   if (endptr)
@@ -115,6 +115,6 @@ bool Gis_read_stream::check_next_symbol(char symbol)
 void Gis_read_stream::set_error_msg(const char *msg)
 {
   size_t len= strlen(msg);			// ok in this context
-  m_err_msg= (char *) my_realloc(m_err_msg, len + 1, MYF(MY_ALLOW_ZERO_PTR));
+  m_err_msg= (char *) my_realloc(m_err_msg, (uint) len + 1, MYF(MY_ALLOW_ZERO_PTR));
   memcpy(m_err_msg, msg, len + 1);
 }
diff --git a/sql/ha_myisam.cc b/sql/ha_myisam.cc
index 1352fd84d9d..0d9c32adbfa 100644
--- a/sql/ha_myisam.cc
+++ b/sql/ha_myisam.cc
@@ -1068,7 +1068,7 @@ bool ha_myisam::check_and_repair(THD *thd)
   old_query_length= thd->query_length;
   pthread_mutex_lock(&LOCK_thread_count);
   thd->query= (char*) table->s->table_name;
-  thd->query_length= strlen(table->s->table_name);
+  thd->query_length= (uint32) strlen(table->s->table_name);
   pthread_mutex_unlock(&LOCK_thread_count);
 
   if ((marked_crashed= mi_is_crashed(file)) || check(thd, &check_opt))
diff --git a/sql/ha_myisammrg.cc b/sql/ha_myisammrg.cc
index 0796ded3ac0..5d3f379081c 100644
--- a/sql/ha_myisammrg.cc
+++ b/sql/ha_myisammrg.cc
@@ -466,7 +466,7 @@ void ha_myisammrg::append_create_info(String *packet)
   MYRG_TABLE *open_table,*first;
 
   current_db= table->s->db;
-  db_length=  strlen(current_db);
+  db_length= (uint) strlen(current_db);
 
   for (first=open_table=file->open_tables ;
        open_table != file->end_table ;
diff --git a/sql/item.cc b/sql/item.cc
index 680b771f908..b722a4cb122 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -307,7 +307,7 @@ void *Item::operator new(size_t size, Item *reuse, uint *rsize)
     return (void *)reuse;
   }
   if (rsize)
-    (*rsize)= size;
+    (*rsize)= (uint) size;
   return (void *)sql_alloc((uint)size);
 }
 
@@ -382,7 +382,7 @@ void Item::print_item_w_name(String *str)
   {
     THD *thd= current_thd;
     str->append(" AS ", 4);
-    append_identifier(thd, str, name, strlen(name));
+    append_identifier(thd, str, name, (uint) strlen(name));
   }
 }
 
@@ -1132,27 +1132,27 @@ void Item_ident::print(String *str)
   if (!table_name || !field_name)
   {
     const char *nm= field_name ? field_name : name ? name : "tmp_field";
-    append_identifier(thd, str, nm, strlen(nm));
+    append_identifier(thd, str, nm, (uint) strlen(nm));
     return;
   }
   if (db_name && db_name[0] && !alias_name_used)
   {
-    append_identifier(thd, str, d_name, strlen(d_name));
+    append_identifier(thd, str, d_name, (uint) strlen(d_name));
     str->append('.');
-    append_identifier(thd, str, t_name, strlen(t_name));
+    append_identifier(thd, str, t_name, (uint) strlen(t_name));
     str->append('.');
-    append_identifier(thd, str, field_name, strlen(field_name));
+    append_identifier(thd, str, field_name, (uint) strlen(field_name));
   }
   else
   {
     if (table_name[0])
     {
-      append_identifier(thd, str, t_name, strlen(t_name));
+      append_identifier(thd, str, t_name, (uint) strlen(t_name));
       str->append('.');
-      append_identifier(thd, str, field_name, strlen(field_name));
+      append_identifier(thd, str, field_name, (uint) strlen(field_name));
     }
     else
-      append_identifier(thd, str, field_name, strlen(field_name));
+      append_identifier(thd, str, field_name, (uint) strlen(field_name));
   }
 }
 
@@ -2179,7 +2179,7 @@ const String *Item_param::query_val_str(String* str) const
       ptr+= escape_string_for_mysql(str_value.charset(), ptr, 0,
                                     str_value.ptr(), str_value.length());
       *ptr++= '\'';
-      str->length(ptr - buf);
+      str->length((uint32) (ptr - buf));
       break;
     }
   case NULL_VALUE:
@@ -4597,7 +4597,8 @@ void Item_trigger_field::setup_field(THD *thd, TABLE *table)
     Try to find field by its name and if it will be found
     set field_idx properly.
   */
-  (void)find_field_in_real_table(thd, table, field_name, strlen(field_name),
+  (void)find_field_in_real_table(thd, table, field_name,
+                                 (uint) strlen(field_name),
                                  0, 0, &field_idx);
   thd->set_query_id= save_set_query_id;
   triggers= table->triggers;
diff --git a/sql/item.h b/sql/item.h
index 1fe90a41e3a..fdbd6ba3326 100644
--- a/sql/item.h
+++ b/sql/item.h
@@ -630,7 +630,7 @@ public:
     Item *it= this_item();
 
     if (name)
-      it->set_name(name, strlen(name), system_charset_info);
+      it->set_name(name, (uint) strlen(name), system_charset_info);
     else
       it->set_name(m_name.str, m_name.length, system_charset_info);
     it->make_field(field);
diff --git a/sql/item_cmpfunc.cc b/sql/item_cmpfunc.cc
index b5b37efaf07..cb8a31c65e7 100644
--- a/sql/item_cmpfunc.cc
+++ b/sql/item_cmpfunc.cc
@@ -2794,10 +2794,11 @@ bool Item_func_like::fix_fields(THD *thd, TABLE_LIST *tlist, Item ** ref)
       if (canDoTurboBM)
       {
         pattern     = first + 1;
-        pattern_len = len - 2;
+        pattern_len = (int) len - 2;
         DBUG_PRINT("info", ("Initializing pattern: '%s'", first));
-        int *suff = (int*) thd->alloc(sizeof(int)*((pattern_len + 1)*2+
-                                      alphabet_size));
+        int *suff = (int*) thd->alloc((int) (sizeof(int)*
+                                      ((pattern_len + 1)*2+
+                                      alphabet_size)));
         bmGs      = suff + pattern_len + 1;
         bmBc      = bmGs + pattern_len + 1;
         turboBM_compute_good_suffix_shifts(suff);
diff --git a/sql/password.c b/sql/password.c
index 79675ade30b..60cc0ac0c97 100644
--- a/sql/password.c
+++ b/sql/password.c
@@ -146,7 +146,7 @@ void hash_password(ulong *result, const char *password, uint password_len)
 void make_scrambled_password_323(char *to, const char *password)
 {
   ulong hash_res[2];
-  hash_password(hash_res, password, strlen(password));
+  hash_password(hash_res, password, (uint) strlen(password));
   sprintf(to, "%08lx%08lx", hash_res[0], hash_res[1]);
 }
 
@@ -172,7 +172,7 @@ void scramble_323(char *to, const char *message, const char *password)
   {
     char extra, *to_start=to;
     const char *message_end= message + SCRAMBLE_LENGTH_323;
-    hash_password(hash_pass,password, strlen(password));
+    hash_password(hash_pass,password, (uint) strlen(password));
     hash_password(hash_message, message, SCRAMBLE_LENGTH_323);
     randominit(&rand_st,hash_pass[0] ^ hash_message[0],
                hash_pass[1] ^ hash_message[1]);
@@ -394,7 +394,7 @@ make_scrambled_password(char *to, const char *password)
 
   sha1_reset(&sha1_context);
   /* stage 1: hash password */
-  sha1_input(&sha1_context, (uint8 *) password, strlen(password));
+  sha1_input(&sha1_context, (uint8 *) password, (uint) strlen(password));
   sha1_result(&sha1_context, (uint8 *) to);
   /* stage 2: hash stage1 output */
   sha1_reset(&sha1_context);
@@ -433,7 +433,7 @@ scramble(char *to, const char *message, const char *password)
 
   sha1_reset(&sha1_context);
   /* stage 1: hash password */
-  sha1_input(&sha1_context, (uint8 *) password, strlen(password));
+  sha1_input(&sha1_context, (uint8 *) password, (uint) strlen(password));
   sha1_result(&sha1_context, hash_stage1);
   /* stage 2: hash stage 1; note that hash_stage2 is stored in the database */
   sha1_reset(&sha1_context);
diff --git a/sql/set_var.h b/sql/set_var.h
index 56690c46131..a6532323b34 100644
--- a/sql/set_var.h
+++ b/sql/set_var.h
@@ -786,7 +786,8 @@ public:
     if (value_arg && value_arg->type() == Item::FIELD_ITEM)
     {
       Item_field *item= (Item_field*) value_arg;
-      if (!(value=new Item_string(item->field_name, strlen(item->field_name),
+      if (!(value=new Item_string(item->field_name, 
+                  (uint) strlen(item->field_name),
 				  item->collation.collation)))
 	value=value_arg;			/* Give error message later */
     }
diff --git a/strings/ctype-big5.c b/strings/ctype-big5.c
index a4040ed2b90..01ecd63d52b 100644
--- a/strings/ctype-big5.c
+++ b/strings/ctype-big5.c
@@ -6320,7 +6320,7 @@ uint my_well_formed_len_big5(CHARSET_INFO *cs __attribute__((unused)),
       break;
     }
   }
-  return b - b0;
+  return (uint) (b - b0);
 }
 
 
diff --git a/strings/ctype-bin.c b/strings/ctype-bin.c
index 13105df9334..40ecbc33d61 100644
--- a/strings/ctype-bin.c
+++ b/strings/ctype-bin.c
@@ -433,7 +433,7 @@ skip:
         if (nmatch > 0)
 	{
 	  match[0].beg= 0;
-	  match[0].end= str- (const uchar*)b-1;
+	  match[0].end= (uint) (str- (const uchar*)b-1);
 	  match[0].mblen= match[0].end;
 
 	  if (nmatch > 1)
diff --git a/strings/ctype-cp932.c b/strings/ctype-cp932.c
index fd2b0fd8e21..f62cf2db599 100644
--- a/strings/ctype-cp932.c
+++ b/strings/ctype-cp932.c
@@ -5446,7 +5446,7 @@ uint my_well_formed_len_cp932(CHARSET_INFO *cs __attribute__((unused)),
       break;
     }
   }
-  return b - b0;
+  return (uint) (b - b0);
 }
 
 
diff --git a/strings/ctype-eucjpms.c b/strings/ctype-eucjpms.c
index 784293918ed..58caac15256 100644
--- a/strings/ctype-eucjpms.c
+++ b/strings/ctype-eucjpms.c
@@ -8403,14 +8403,14 @@ uint my_well_formed_len_eucjpms(CHARSET_INFO *cs __attribute__((unused)),
 
     chbeg= (char *) b++;
     if (b >= (uchar *) end)         /* need more bytes */
-      return chbeg - beg;           /* unexpected EOL  */
+      return (uint) (chbeg - beg);  /* unexpected EOL  */
 
     if (ch == 0x8E)                 /* [x8E][xA0-xDF] */
     {
       if (*b >= 0xA0 && *b <= 0xDF)
         continue;
       *error=1;
-      return chbeg - beg;           /* invalid sequence */
+      return (uint) (chbeg - beg);  /* invalid sequence */
     }
 
     if (ch == 0x8F)                 /* [x8F][xA1-xFE][xA1-xFE] */
@@ -8419,7 +8419,7 @@ uint my_well_formed_len_eucjpms(CHARSET_INFO *cs __attribute__((unused)),
       if (b >= (uchar*) end)
       {
         *error= 1;
-        return chbeg - beg;         /* unexpected EOL */
+        return (uint)(chbeg - beg); /* unexpected EOL */
       }
     }
 
@@ -8427,9 +8427,9 @@ uint my_well_formed_len_eucjpms(CHARSET_INFO *cs __attribute__((unused)),
         *b >= 0xA1 && *b <= 0xFE)   /* [xA1-xFE][xA1-xFE] */
       continue;
     *error=1;
-    return chbeg - beg;             /* invalid sequence */
+    return (uint) (chbeg - beg);    /* invalid sequence */
   }
-  return b - (uchar *) beg;
+  return (uint) (b - (uchar *) beg);
 }
 
 
diff --git a/strings/ctype-mb.c b/strings/ctype-mb.c
index 2d9f8b16bfc..6f171c03845 100644
--- a/strings/ctype-mb.c
+++ b/strings/ctype-mb.c
@@ -268,7 +268,7 @@ uint my_charpos_mb(CHARSET_INFO *cs __attribute__((unused)),
     pos+= (mblen= my_ismbchar(cs, pos, end)) ? mblen : 1;
     length--;
   }
-  return length ? end+2-start : pos-start;
+  return (uint) (length ? end+2-start : pos-start);
 }
 
 
@@ -290,7 +290,7 @@ uint my_well_formed_len_mb(CHARSET_INFO *cs, const char *b, const char *e,
     b+= mblen;
     pos--;
   }
-  return b - b_start;
+  return (uint) (b - b_start);
 }
 
 
@@ -329,7 +329,7 @@ uint my_instr_mb(CHARSET_INFO *cs,
         if (nmatch)
         {
           match[0].beg= 0;
-          match[0].end= b-b0;
+          match[0].end= (uint) (b-b0);
           match[0].mblen= res;
           if (nmatch > 1)
           {
diff --git a/strings/ctype-simple.c b/strings/ctype-simple.c
index 6ed1af846ec..fe514186deb 100644
--- a/strings/ctype-simple.c
+++ b/strings/ctype-simple.c
@@ -1084,7 +1084,7 @@ ulong my_scan_8bit(CHARSET_INFO *cs, const char *str, const char *end, int sq)
     if (*str == '.')
     {
       for(str++ ; str != end && *str == '0' ; str++);
-      return str-str0;
+      return (ulong) (str-str0);
     }
     return 0;
 
@@ -1094,7 +1094,7 @@ ulong my_scan_8bit(CHARSET_INFO *cs, const char *str, const char *end, int sq)
       if (!my_isspace(cs,*str))
         break;
     }
-    return str-str0;
+    return (ulong) (str-str0);
   default:
     return 0;
   }
@@ -1111,14 +1111,14 @@ void my_fill_8bit(CHARSET_INFO *cs __attribute__((unused)),
 uint my_numchars_8bit(CHARSET_INFO *cs __attribute__((unused)),
 		      const char *b, const char *e)
 {
-  return e-b;
+  return (uint) (e-b);
 }
 
 
 uint my_numcells_8bit(CHARSET_INFO *cs __attribute__((unused)),
 		      const char *b, const char *e)
 {
-  return e-b;
+  return (uint) (e-b);
 }
 
 
@@ -1193,7 +1193,7 @@ skip:
 	if (nmatch > 0)
 	{
 	  match[0].beg= 0;
-	  match[0].end= str- (const uchar*)b-1;
+	  match[0].end= (uint) (str- (const uchar*)b-1);
 	  match[0].mblen= match[0].end;
 	  
 	  if (nmatch > 1)
diff --git a/strings/ctype-sjis.c b/strings/ctype-sjis.c
index 9cd5d6d7981..161f75ca936 100644
--- a/strings/ctype-sjis.c
+++ b/strings/ctype-sjis.c
@@ -4615,7 +4615,7 @@ uint my_well_formed_len_sjis(CHARSET_INFO *cs __attribute__((unused)),
       break;
     }
   }
-  return b - b0;
+  return (uint) (b - b0);
 }
 
 
diff --git a/strings/ctype-uca.c b/strings/ctype-uca.c
index eb207c9821f..8bc48b3609d 100644
--- a/strings/ctype-uca.c
+++ b/strings/ctype-uca.c
@@ -7527,7 +7527,7 @@ static void my_coll_lexem_print_error(MY_COLL_LEXEM *lexem,
 {
   char tail[30];
   size_t len= lexem->end - lexem->prev;
-  strmake (tail, lexem->prev, min(len, sizeof(tail)-1));
+  strmake (tail, lexem->prev, (uint) min(len, sizeof(tail)-1));
   errstr[errsize-1]= '\0';
   my_snprintf(errstr,errsize-1,"%s at '%s'", txt, tail);
 }
@@ -7769,7 +7769,7 @@ static int my_coll_rule_parse(MY_COLL_RULE *rule, size_t mitems,
       continue;
     }
   }
-  return (size_t) nitems;
+  return (int) nitems;
 }
 
 #define MY_MAX_COLL_RULE 128
diff --git a/strings/ctype-ucs2.c b/strings/ctype-ucs2.c
index 4acd75d7a6f..5844a6e688b 100644
--- a/strings/ctype-ucs2.c
+++ b/strings/ctype-ucs2.c
@@ -229,7 +229,7 @@ static int my_strnncoll_ucs2(CHARSET_INFO *cs,
     s+=s_res;
     t+=t_res;
   }
-  return t_is_prefix ? t-te : ((se-s) - (te-t));
+  return (int) (t_is_prefix ? t-te : ((se-s) - (te-t)));
 }
 
 /*
@@ -344,14 +344,14 @@ static int my_strncasecmp_ucs2(CHARSET_INFO *cs,
     s+=s_res;
     t+=t_res;
   }
-  return ( (se-s) - (te-t) );
+  return (int) ( (se-s) - (te-t) );
 }
 
 
 static int my_strcasecmp_ucs2(CHARSET_INFO *cs, const char *s, const char *t)
 {
-  uint s_len=strlen(s);
-  uint t_len=strlen(t);
+  uint s_len= (uint) strlen(s);
+  uint t_len= (uint) strlen(t);
   uint len = (s_len > t_len) ? s_len : t_len;
   return  my_strncasecmp_ucs2(cs, s, t, len);
 }
@@ -386,7 +386,7 @@ static int my_strnxfrm_ucs2(CHARSET_INFO *cs,
     dst+=res;
   }
   if (dst < de)
-    cs->cset->fill(cs, (char*) dst, de - dst, ' ');
+    cs->cset->fill(cs, (char*) dst, (uint) (de - dst), ' ');
   return dstlen;
 }
 
@@ -1370,7 +1370,7 @@ int my_strnncoll_ucs2_bin(CHARSET_INFO *cs,
     s+=s_res;
     t+=t_res;
   }
-  return t_is_prefix ? t-te : ((se-s) - (te-t));
+  return (int) (t_is_prefix ? t-te : ((se-s) - (te-t)));
 }
 
 static int my_strnncollsp_ucs2_bin(CHARSET_INFO *cs, 
@@ -1387,8 +1387,8 @@ static int my_strnncollsp_ucs2_bin(CHARSET_INFO *cs,
 static
 int my_strcasecmp_ucs2_bin(CHARSET_INFO *cs, const char *s, const char *t)
 {
-  uint s_len=strlen(s);
-  uint t_len=strlen(t);
+  uint s_len= (uint) strlen(s);
+  uint t_len= (uint) strlen(t);
   uint len = (s_len > t_len) ? s_len : t_len;
   return  my_strncasecmp_ucs2(cs, s, t, len);
 }
@@ -1525,7 +1525,7 @@ ulong my_scan_ucs2(CHARSET_INFO *cs __attribute__((unused)),
       if (str[0] != '\0' || str[1] != ' ')
         break;
     }
-    return str - str0;
+    return (ulong) (str - str0);
   default:
     return 0;
   }
diff --git a/strings/ctype-ujis.c b/strings/ctype-ujis.c
index 6b704980d0d..3f934ebd9ce 100644
--- a/strings/ctype-ujis.c
+++ b/strings/ctype-ujis.c
@@ -8270,7 +8270,7 @@ uint my_well_formed_len_ujis(CHARSET_INFO *cs __attribute__((unused)),
     if (b >= (uchar *) end)         /* need more bytes */
     {
       *error= 1;
-      return chbeg - beg;           /* unexpected EOL  */ 
+      return (uint) (chbeg - beg);  /* unexpected EOL  */ 
     }
     
     if (ch == 0x8E)                 /* [x8E][xA0-xDF] */
@@ -8278,7 +8278,7 @@ uint my_well_formed_len_ujis(CHARSET_INFO *cs __attribute__((unused)),
       if (*b >= 0xA0 && *b <= 0xDF)
         continue;
       *error= 1;
-      return chbeg - beg;           /* invalid sequence */
+      return (uint) (chbeg - beg);  /* invalid sequence */
     }
     
     if (ch == 0x8F)                 /* [x8F][xA1-xFE][xA1-xFE] */
@@ -8287,7 +8287,7 @@ uint my_well_formed_len_ujis(CHARSET_INFO *cs __attribute__((unused)),
       if (b >= (uchar*) end)
       {
         *error= 1;
-        return chbeg - beg;         /* unexpected EOL */
+        return (uint) (chbeg - beg); /* unexpected EOL */
       }
     }
     
@@ -8295,9 +8295,9 @@ uint my_well_formed_len_ujis(CHARSET_INFO *cs __attribute__((unused)),
         *b >= 0xA1 && *b <= 0xFE)   /* [xA1-xFE][xA1-xFE] */
       continue;
     *error= 1;
-    return chbeg - beg;             /* invalid sequence */
+    return (uint) (chbeg - beg);    /* invalid sequence */
   }
-  return b - (uchar *) beg;
+  return (uint) (b - (uchar *) beg);
 }
 
 
diff --git a/strings/ctype-utf8.c b/strings/ctype-utf8.c
index 6f6d24d8643..53197972dab 100644
--- a/strings/ctype-utf8.c
+++ b/strings/ctype-utf8.c
@@ -1932,7 +1932,7 @@ static uchar to_upper_utf8[] = {
 static inline int bincmp(const uchar *s, const uchar *se,
                          const uchar *t, const uchar *te)
 {
-  int slen=se-s, tlen=te-t;
+  int slen= (int) (se-s), tlen= (int) (te-t);
   int len=min(slen,tlen);
   int cmp= memcmp(s,t,len);
   return cmp ? cmp : slen-tlen;
@@ -2108,7 +2108,7 @@ static uint my_caseup_utf8(CHARSET_INFO *cs, char *src, uint srclen,
     src+= srcres;
     dst+= dstres;
   }
-  return dst - dst0;
+  return (uint) (dst - dst0);
 }
 
 static void my_hash_sort_utf8(CHARSET_INFO *cs, const uchar *s, uint slen,
@@ -2141,7 +2141,7 @@ static void my_hash_sort_utf8(CHARSET_INFO *cs, const uchar *s, uint slen,
 
 static void my_caseup_str_utf8(CHARSET_INFO * cs, char * s)
 {
-  uint len= strlen(s);
+  uint len= (uint) strlen(s);
   my_caseup_utf8(cs, s, len, s, len);
 }
 
@@ -2165,12 +2165,12 @@ static uint my_casedn_utf8(CHARSET_INFO *cs, char *src, uint srclen,
     src+= srcres;
     dst+= dstres;
   }
-  return dst - dst0;
+  return (uint) (dst - dst0);
 }
 
 static void my_casedn_str_utf8(CHARSET_INFO *cs, char * s)
 {
-  uint len= strlen(s);
+  uint len= (uint) strlen(s);
   my_casedn_utf8(cs, s, len, s, len);
 }
 
@@ -2210,7 +2210,7 @@ static int my_strnncoll_utf8(CHARSET_INFO *cs,
     s+=s_res;
     t+=t_res;
   }
-  return t_is_prefix ? t-te : ((se-s) - (te-t));
+  return (int) (t_is_prefix ? t-te : ((se-s) - (te-t)));
 }
 
 
@@ -2284,8 +2284,8 @@ static int my_strnncollsp_utf8(CHARSET_INFO *cs,
     t+=t_res;
   }
 
-  slen= se-s;
-  tlen= te-t;
+  slen= (uint) (se-s);
+  tlen= (uint) (te-t);
   res= 0;
 
   if (slen != tlen)
diff --git a/strings/ctype.c b/strings/ctype.c
index 4454d3c45e1..ba6dbaeb887 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -216,7 +216,7 @@ static int cs_value(MY_XML_PARSER *st,const char *attr, uint len)
 {
   struct my_cs_file_info *i= (struct my_cs_file_info *)st->user_data;
   struct my_cs_file_section_st *s;
-  int    state= (s=cs_file_sec(st->attr,strlen(st->attr))) ? s->state : 0;
+  int    state= (int)((s=cs_file_sec(st->attr, (int) strlen(st->attr))) ? s->state : 0);
   
 #ifndef DBUG_OFF
   if(0){
diff --git a/strings/decimal.c b/strings/decimal.c
index 4a487f3c9b0..8d07a84ede1 100644
--- a/strings/decimal.c
+++ b/strings/decimal.c
@@ -472,7 +472,7 @@ static void digits_bounds(decimal_t *from, int *start_result, int *end_result)
   else
   {
     i= DIG_PER_DEC1 - 1;
-    start= (buf_beg - from->buf) * DIG_PER_DEC1;
+    start= (int) ((buf_beg - from->buf) * DIG_PER_DEC1);
   }
   if (buf_beg < end)
     for (; *buf_beg < powers10[i--]; start++) ;
@@ -484,13 +484,13 @@ static void digits_bounds(decimal_t *from, int *start_result, int *end_result)
   /* find non-zero decimal digit from the end */
   if (buf_end == end - 1 && from->frac)
   {
-    stop= ((buf_end - from->buf) * DIG_PER_DEC1 +
-           (i= ((from->frac - 1) % DIG_PER_DEC1 + 1)));
+    stop= (int) (((buf_end - from->buf) * DIG_PER_DEC1 +
+           (i= ((from->frac - 1) % DIG_PER_DEC1 + 1))));
     i= DIG_PER_DEC1 - i + 1;
   }
   else
   {
-    stop= (buf_end - from->buf + 1) * DIG_PER_DEC1;
+    stop= (int) ((buf_end - from->buf + 1) * DIG_PER_DEC1);
     i= 1;
   }
   for (; *buf_end % powers10[i++] == 0; stop--);
@@ -794,13 +794,13 @@ internal_str2dec(const char *from, decimal_t *to, char **end, my_bool fixed)
   s1=s;
   while (s < end_of_string && my_isdigit(&my_charset_latin1, *s))
     s++;
-  intg=s-s1;
+  intg= (int) (s-s1);
   if (s < end_of_string && *s=='.')
   {
     endp= s+1;
     while (endp < end_of_string && my_isdigit(&my_charset_latin1, *endp))
       endp++;
-    frac= endp - s - 1;
+    frac= (int) (endp - s - 1);
   }
   else
   {
@@ -1715,14 +1715,14 @@ static int do_sub(decimal_t *from1, decimal_t *from2, decimal_t *to)
     while (buf1 < stop1 && *buf1 == 0)
       buf1++;
     start1=buf1;
-    intg1=stop1-buf1;
+    intg1= (int) (stop1-buf1);
   }
   if (unlikely(*buf2 == 0))
   {
     while (buf2 < stop2 && *buf2 == 0)
       buf2++;
     start2=buf2;
-    intg2=stop2-buf2;
+    intg2= (int) (stop2-buf2);
   }
   if (intg2 > intg1)
     carry=1;
@@ -1734,8 +1734,8 @@ static int do_sub(decimal_t *from1, decimal_t *from2, decimal_t *to)
       end1--;
     while (unlikely((buf2 <= end2) && (*end2 == 0)))
       end2--;
-    frac1= (end1 - stop1) + 1;
-    frac2= (end2 - stop2) + 1;
+    frac1= (int) (end1 - stop1) + 1;
+    frac2= (int) (end2 - stop2) + 1;
     while (buf1 <=end1 && buf2 <= end2 && *buf1 == *buf2)
       buf1++, buf2++;
     if (buf1 <= end1)
@@ -2086,7 +2086,7 @@ static int do_div_mod(decimal_t *from1, decimal_t *from2,
   /* removing end zeroes */
   while (*stop2 == 0 && stop2 >= start2)
     stop2--;
-  len2= stop2++ - start2;
+  len2= (int) (stop2++ - start2);
 
   /*
     calculating norm2 (normalized *start2) - we need *start2 to be large
@@ -2173,7 +2173,7 @@ static int do_div_mod(decimal_t *from1, decimal_t *from2,
     if (dcarry)
       *--start1=dcarry;
     buf0=to->buf;
-    intg0=ROUND_UP(prec1-frac1)-(start1-tmp1);
+    intg0=(int) (ROUND_UP(prec1-frac1)-(start1-tmp1));
     frac0=ROUND_UP(to->frac);
     error=E_DEC_OK;
     if (unlikely(frac0==0 && intg0==0))
diff --git a/strings/xml.c b/strings/xml.c
index d19c3dab241..17f1b400957 100644
--- a/strings/xml.c
+++ b/strings/xml.c
@@ -148,7 +148,7 @@ static int my_xml_enter(MY_XML_PARSER *st, const char *str, uint len)
   memcpy(st->attrend,str,len);
   st->attrend+=len;
   st->attrend[0]='\0';
-  return st->enter ? st->enter(st,st->attr,st->attrend-st->attr) : MY_XML_OK;
+  return st->enter ?  st->enter(st,st->attr,st->attrend-st->attr) : MY_XML_OK;
 }
 
 
@@ -170,7 +170,7 @@ static int my_xml_leave(MY_XML_PARSER *p, const char *str, uint slen)
   
   /* Find previous '.' or beginning */
   for( e=p->attrend; (e>p->attr) && (e[0]!='.') ; e--);
-  glen = (e[0]=='.') ? (p->attrend-e-1) : p->attrend-e;
+  glen = (uint) ((e[0]=='.') ? (p->attrend-e-1) : p->attrend-e);
   
   if (str && (slen != glen))
   {
@@ -180,7 +180,7 @@ static int my_xml_leave(MY_XML_PARSER *p, const char *str, uint slen)
     return MY_XML_ERROR;
   }
   
-  rc = p->leave_xml ? p->leave_xml(p,p->attr,p->attrend-p->attr) : MY_XML_OK;
+  rc = p->leave_xml ?  p->leave_xml(p,p->attr,p->attrend-p->attr) : MY_XML_OK;
   
   *e='\0';
   p->attrend=e;
@@ -221,7 +221,7 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
           sprintf(p->errstr,"1: %s unexpected (ident wanted)",lex2str(lex));
           return MY_XML_ERROR;
         }
-        if(MY_XML_OK!=my_xml_leave(p,a.beg,a.end-a.beg))
+        if(MY_XML_OK!=my_xml_leave(p,a.beg,(uint) (a.end-a.beg)))
           return MY_XML_ERROR;
         lex=my_xml_scan(p,&a);
         goto gt;
@@ -240,7 +240,7 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
       
       if (MY_XML_IDENT==lex)
       {
-        if(MY_XML_OK!=my_xml_enter(p,a.beg,a.end-a.beg))
+        if(MY_XML_OK!=my_xml_enter(p,a.beg,(uint) (a.end-a.beg)))
           return MY_XML_ERROR;
       }
       else
@@ -258,9 +258,9 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
           lex=my_xml_scan(p,&b);
           if ( (lex==MY_XML_IDENT) || (lex==MY_XML_STRING) )
           {
-            if((MY_XML_OK!=my_xml_enter(p,a.beg,a.end-a.beg))  ||
-               (MY_XML_OK!=my_xml_value(p,b.beg,b.end-b.beg))  ||
-               (MY_XML_OK!=my_xml_leave(p,a.beg,a.end-a.beg)))
+            if((MY_XML_OK!=my_xml_enter(p,a.beg,(uint) (a.end-a.beg)))  ||
+               (MY_XML_OK!=my_xml_value(p,b.beg,(uint) (b.end-b.beg)))  ||
+               (MY_XML_OK!=my_xml_leave(p,a.beg,(uint) (a.end-a.beg))))
               return MY_XML_ERROR;
           }
           else
@@ -272,8 +272,8 @@ int my_xml_parse(MY_XML_PARSER *p,const char *str, uint len)
         }
         else if ( (MY_XML_STRING==lex) || (MY_XML_IDENT==lex) )
         {
-          if((MY_XML_OK!=my_xml_enter(p,a.beg,a.end-a.beg)) ||
-             (MY_XML_OK!=my_xml_leave(p,a.beg,a.end-a.beg)))
+          if((MY_XML_OK!=my_xml_enter(p,a.beg,(uint) (a.end-a.beg))) ||
+             (MY_XML_OK!=my_xml_leave(p,a.beg,(uint) (a.end-a.beg))))
            return MY_XML_ERROR;
         }
         else
@@ -321,7 +321,7 @@ gt:
       my_xml_norm_text(&a);
       if (a.beg!=a.end)
       {
-        my_xml_value(p,a.beg,a.end-a.beg);
+        my_xml_value(p,a.beg,(uint) (a.end-a.beg));
       }
     }
   }
@@ -384,7 +384,7 @@ uint my_xml_error_pos(MY_XML_PARSER *p)
     if (s[0]=='\n')
       beg=s;
   }
-  return p->cur-beg;
+  return (uint) (p->cur-beg);
 }
 
 uint my_xml_error_lineno(MY_XML_PARSER *p)