automerge

5 files changed, 11 insertions, 5 deletions

diff --git a/client/mysqldump.c b/client/mysqldump.c
index 6b2c2a06834..f7b894803bd 100644
--- a/client/mysqldump.c
+++ b/client/mysqldump.c
@@ -4110,7 +4110,7 @@ static my_bool dump_all_views_in_db(char *database)
     for (numrows= 0 ; (table= getTableName(1)); )
     {
       char *end= strmov(afterdot, table);
-      if (include_table((uchar*) hash_key,end - hash_key))
+      if (include_table((byte*) hash_key,end - hash_key))
       {
         numrows++;
         dynstr_append_checked(&query, quote_name(table, table_buff, 1));
@@ -4131,7 +4131,7 @@ static my_bool dump_all_views_in_db(char *database)
   while ((table= getTableName(0)))
   {
     char *end= strmov(afterdot, table);
-    if (include_table((uchar*) hash_key, end - hash_key))
+    if (include_table((byte*) hash_key, end - hash_key))
       get_view_structure(table, database);
   }
   if (opt_xml)
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c
index baed1dfad49..9d0a803cc6c 100644
--- a/cmd-line-utils/readline/bind.c
+++ b/cmd-line-utils/readline/bind.c
@@ -699,8 +699,10 @@ rl_function_of_keyseq (keyseq, map, type)
 
   for (i = 0; keyseq && keyseq[i]; i++)
     {
-      unsigned char ic = keyseq[i];
+      unsigned char uc = keyseq[i];
+      int ic;
 
+      ic= uc;
       if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii)
 	{
 	  if (map[ESC].type == ISKMAP)
diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c
index 6f63faa9738..54c56954f43 100644
--- a/cmd-line-utils/readline/display.c
+++ b/cmd-line-utils/readline/display.c
@@ -1888,7 +1888,7 @@ rl_character_len (c, pos)
 
   uc = (unsigned char)c;
 
-  if (META_CHAR (uc))
+  if (META_CHAR (c))
     return ((_rl_output_meta_chars == 0) ? 4 : 1);
 
   if (uc == '\t')
diff --git a/dbug/user.r b/dbug/user.r
index 19de840d0ad..ef67ef7a7cf 100644
--- a/dbug/user.r
+++ b/dbug/user.r
@@ -32,6 +32,7 @@
 .\"           === Set line length
 .\".ll 6.5i
 .TL
+.warn 0
 D B U G
 .P 0
 C Program Debugging Package
diff --git a/strings/ctype.c b/strings/ctype.c
index 446eb168804..4a54d898337 100644
--- a/strings/ctype.c
+++ b/strings/ctype.c
@@ -328,7 +328,10 @@ my_string_repertoire(CHARSET_INFO *cs, const char *str, ulong length)
   {
     my_wc_t wc;
     int chlen;
-    for (; (chlen= cs->cset->mb_wc(cs, &wc, str, strend)) > 0; str+= chlen)
+    for (; (chlen= cs->cset->mb_wc(cs, &wc, 
+                                   (const unsigned char *) str, 
+                                   (const unsigned char *) strend)) > 0; 
+         str+= chlen)
     {
       if (wc > 0x7F)
         return MY_REPERTOIRE_UNICODE30;