6 files changed, 23 insertions, 23 deletions
diff --git a/client/mysql.cc b/client/mysql.cc
index 93d7c78f1f4..987f70dee5d 100644
--- a/client/mysql.cc
+++ b/client/mysql.cc
@@ -286,8 +286,8 @@ int main(int argc,char *argv[])
       histfile=my_strdup(getenv("MYSQL_HISTFILE"),MYF(MY_WME));
     else if (getenv("HOME"))
     {
-      histfile=(char*) my_malloc(strlen(getenv("HOME"))
-				 + strlen("/.mysql_history")+2,
+      histfile=(char*) my_malloc((uint) strlen(getenv("HOME"))
+				 + (uint) strlen("/.mysql_history")+2,
 				 MYF(MY_WME));
       if (histfile)
 	sprintf(histfile,"%s/.mysql_history",getenv("HOME"));
@@ -743,7 +743,7 @@ static COMMANDS *find_command (char *name,char cmd_char)
 	end=0;					// no arguments to function
     }
     else
-      len=strlen(name);
+      len=(uint) strlen(name);
   }
 
   for (uint i= 0; commands[i].name; i++)
@@ -772,7 +772,7 @@ static bool add_line(String &buffer,char *line,char *in_string)
     add_history(line);
 #endif
 #ifdef USE_MB
-  char *strend=line+strlen(line);
+  char *strend=line+(uint) strlen(line);
 #endif
 
   for (pos=out=line ; (inchar= (uchar) *pos) ; pos++)
@@ -926,14 +926,14 @@ static char *new_command_generator(char *text,int state)
   static uint i;
 
   if (!state) {
-    textlen=strlen(text);
+    textlen=(uint) strlen(text);
   }
 
   if (textlen>0) { /* lookup in the hash */
     if (!state) {
       uint len;
 
-      b = find_all_matches(&ht,text,strlen(text),&len);
+      b = find_all_matches(&ht,text,(uint) strlen(text),&len);
       if (!b) {
 	return NullS;
       }
@@ -961,7 +961,7 @@ static char *new_command_generator(char *text,int state)
     }
     ptr= NullS;
     while (e && !ptr) { /* find valid entry in bucket */
-      if (strlen(e->str)==b->nKeyLength) {
+      if ((uint) strlen(e->str)==b->nKeyLength) {
 	ptr = strdup(e->str);
       }
       /* find the next used entry */
@@ -1054,7 +1054,7 @@ You can turn off this feature to get a quicker startup with -A\n\n");
       while ((table_row=mysql_fetch_row(tables)))
       {
 	if (!completion_hash_exists(&ht,(char*) table_row[0],
-				    strlen((const char*) table_row[0])))
+				    (uint) strlen((const char*) table_row[0])))
 	  add_word(&ht,table_row[0]);
       }
     }
@@ -1102,7 +1102,7 @@ You can turn off this feature to get a quicker startup with -A\n\n");
 	add_word(&ht,field_names[i][j]);
 	field_names[i][num_fields+j] = my_strdup(sql_field->name,MYF(0));
 	if (!completion_hash_exists(&ht,field_names[i][num_fields+j],
-				    strlen(field_names[i][num_fields+j])))
+				    (uint) strlen(field_names[i][num_fields+j])))
 	  add_word(&ht,field_names[i][num_fields+j]);
 	j++;
       }
@@ -1351,7 +1351,7 @@ print_table_data(MYSQL_RES *result)
   separator.copy("+",1);
   while ((field = mysql_fetch_field(result)))
   {
-    uint length=skip_column_names ? 0 : strlen(field->name);
+    uint length=skip_column_names ? 0 : (uint) strlen(field->name);
     if (quick)
       length=max(length,field->length);
     else
@@ -1437,7 +1437,7 @@ print_table_data_vertically(MYSQL_RES *result)
 
   while ((field = mysql_fetch_field(result)))
   {
-    uint length=strlen(field->name);
+    uint length=(uint) strlen(field->name);
     if (length > max_length)
       max_length= length;
     field->max_length=length;
diff --git a/client/mysqladmin.c b/client/mysqladmin.c
index c2fea6e78ce..ad76cc6021a 100644
--- a/client/mysqladmin.c
+++ b/client/mysqladmin.c
@@ -909,7 +909,7 @@ static void print_top(MYSQL_RES *result)
   mysql_field_seek(result,0);
   while((field = mysql_fetch_field(result)))
   {
-    if ((length=strlen(field->name)) > field->max_length)
+    if ((length=(uint) strlen(field->name)) > field->max_length)
       field->max_length=length;
     else
       length=field->max_length;
@@ -974,7 +974,7 @@ static void print_relative_row_vert(MYSQL_RES *result __attribute__((unused)),
 	 llstr((tmp - last_values[row]), buff));
 
   /* Find the minimum row length needed to output the relative value */
-  if ((length=strlen(buff) > ex_val_max_len[row]) && ex_status_printed)
+  if ((length=(uint) strlen(buff) > ex_val_max_len[row]) && ex_status_printed)
     ex_val_max_len[row] = length;
   last_values[row] = tmp;
 }
diff --git a/client/mysqldump.c b/client/mysqldump.c
index ce687d815d8..c2ef4a96dc0 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -782,7 +782,7 @@ static char *add_load_option(char *ptr,const char *object,
   if (object)
   {
     ptr= strxmov(ptr," ",statement," '",NullS);
-    ptr= field_escape(ptr,object,strlen(object));
+    ptr= field_escape(ptr,object,(uint) strlen(object));
     *ptr++= '\'';
   }
   return ptr;
@@ -910,7 +910,7 @@ static void dumpTable(uint numFields, char *table)
     total_length=net_buffer_length;		/* Force row break */
     row_break=0;
     rownr=0;
-    init_length=strlen(insert_pat)+4;
+    init_length=(uint) strlen(insert_pat)+4;
 
     while ((row=mysql_fetch_row(res)))
     {
@@ -1215,7 +1215,7 @@ static void print_value(FILE *file, MYSQL_RES  *result, MYSQL_ROW row,
 	fputc(' ',file);
 	fputs(prefix, file);
 	if (string_value)
-	  unescape(file,row[0],strlen(row[0]));
+	  unescape(file,row[0],(uint) strlen(row[0]));
 	else
 	  fputs(row[0], file);
 	return;
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index 28cacaa58dc..0a69f18c176 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -454,7 +454,7 @@ static char *add_load_option(char *ptr,const char *object,const char *statement)
   if (object)
   {
     ptr= strxmov(ptr," ",statement," '",NullS);
-    ptr= field_escape(ptr,object,strlen(object));
+    ptr= field_escape(ptr,object,(uint) strlen(object));
     *ptr++= '\'';
   }
   return ptr;
diff --git a/client/mysqlshow.c b/client/mysqlshow.c
index 6cf7cdf9963..bf924ddeecd 100644
--- a/client/mysqlshow.c
+++ b/client/mysqlshow.c
@@ -290,7 +290,7 @@ list_dbs(MYSQL *mysql,const char *wild)
     printf("Wildcard: %s\n",wild);
 
   header="Databases";
-  length=strlen(header);
+  length=(uint) strlen(header);
   field=mysql_fetch_field(result);
   if (length < field->max_length)
     length=field->max_length;
@@ -331,7 +331,7 @@ list_tables(MYSQL *mysql,const char *db,const char *table)
   putchar('\n');
 
   header="Tables";
-  head_length=strlen(header);
+  head_length=(uint) strlen(header);
   field=mysql_fetch_field(result);
   if (head_length < field->max_length)
     head_length=field->max_length;
@@ -470,7 +470,7 @@ print_header(const char *header,uint head_length,...)
   putchar('|');
   for (;;)
   {
-    str_length=strlen(field);
+    str_length=(uint) strlen(field);
     if (str_length > length)
       str_length=length+1;
     pre_space=(uint) (((int) length-(int) str_length)/2)+1;
@@ -520,7 +520,7 @@ print_row(const char *header,uint head_length,...)
     putchar('|');
     putchar(' ');
     fputs(field,stdout);
-    field_length=strlen(field);
+    field_length=(uint) strlen(field);
     for (i=field_length ; i <= length ; i++)
       putchar(' ');
     if (!(field=va_arg(args,my_string)))
@@ -580,7 +580,7 @@ static void print_res_top(MYSQL_RES *result)
   mysql_field_seek(result,0);
   while((field = mysql_fetch_field(result)))
   {
-    if ((length=strlen(field->name)) > field->max_length)
+    if ((length=(uint) strlen(field->name)) > field->max_length)
       field->max_length=length;
     else
       length=field->max_length;
diff --git a/client/readline.cc b/client/readline.cc
index 95e98cb90c2..c14059d98c8 100644
--- a/client/readline.cc
+++ b/client/readline.cc
@@ -105,7 +105,7 @@ static bool init_line_buffer_from_string(LINE_BUFFER *buffer,my_string str)
 {
   uint length;
   bzero((char*) buffer,sizeof(buffer[0]));
-  length=strlen(str);
+  length=(uint) strlen(str);
   if (!(buffer->buffer=buffer->start_of_line=buffer->end_of_line=
 	(char*)my_malloc(length+2,MYF(MY_FAE))))
     return 1;