merged 5.0-bugteam -> 5.1-bugteam

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(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(hash_key, end - hash_key))
       get_view_structure(table, database);
   }
   if (opt_xml)

cmd-line-utils/readline/bind.c

@@ -699,11 +699,9 @@ rl_function_of_keyseq (keyseq, map, type)
 
   for (i = 0; keyseq && keyseq[i]; i++)
     {
-      unsigned char uc = keyseq[i];
-      int ic;
+      unsigned char ic = keyseq[i];
 
-      ic= uc;
-      if (META_CHAR (ic) && _rl_convert_meta_chars_to_ascii)
+      if (META_BYTE (ic) && _rl_convert_meta_chars_to_ascii)
 	{
 	  if (map[ESC].type == ISKMAP)
 	    {

cmd-line-utils/readline/chardefs.h

@@ -59,7 +59,8 @@
 #define largest_char 255		    /* Largest character value. */
 
 #define CTRL_CHAR(c) ((c) < control_character_threshold && (((c) & 0x80) == 0))
-#define META_CHAR(c) ((c) > meta_character_threshold && (c) <= largest_char)
+#define META_BYTE(c) ((c) > meta_character_threshold)
+#define META_CHAR(c) (META_BYTE(c) && (c) <= largest_char)
 
 #define CTRL(c) ((c) & control_character_mask)
 #define META(c) ((c) | meta_character_bit)

cmd-line-utils/readline/display.c

@@ -1888,7 +1888,7 @@ rl_character_len (c, pos)
 
   uc = (unsigned char)c;
 
-  if (META_CHAR (c))
+  if (META_BYTE (uc))
     return ((_rl_output_meta_chars == 0) ? 4 : 1);
 
   if (uc == '\t')