bzr commit into mysql-5.0-bugteam branch (joro:2767) Bug#45286

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/B45286-5.0-bugteam/ based on revid:bernt.johnsen@stripped

 2767 Georgi Kodinov	2009-06-05
      Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSX
      
      Fixed the 5.0-bugteam MacOSX warnings.
     @ client/mysqldump.c
        Bug #45286: typecasts
     @ cmd-line-utils/readline/bind.c
        Bug #45286: use variable of right type
     @ cmd-line-utils/readline/display.c
        Bug #45286: use variable of right type
     @ dbug/user.r
        Bug #45286: no warnings in generating man pages
     @ strings/ctype.c
        Bug #45286: typecasts

    modified:
      client/mysqldump.c
      cmd-line-utils/readline/bind.c
      cmd-line-utils/readline/display.c
      dbug/user.r
      strings/ctype.c
=== modified file 'client/mysqldump.c'
--- a/client/mysqldump.c	2009-03-19 13:58:56 +0000
+++ b/client/mysqldump.c	2009-06-05 12:05:26 +0000
@@ -3122,7 +3122,7 @@ static my_bool dump_all_views_in_db(char
     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));
@@ -3143,7 +3143,7 @@ static my_bool dump_all_views_in_db(char
   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)

=== modified file 'cmd-line-utils/readline/bind.c'
--- a/cmd-line-utils/readline/bind.c	2008-01-03 13:26:41 +0000
+++ b/cmd-line-utils/readline/bind.c	2009-06-05 12:05:26 +0000
@@ -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)

=== modified file 'cmd-line-utils/readline/display.c'
--- a/cmd-line-utils/readline/display.c	2008-01-03 13:26:41 +0000
+++ b/cmd-line-utils/readline/display.c	2009-06-05 12:05:26 +0000
@@ -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')

=== modified file 'dbug/user.r'
--- a/dbug/user.r	2008-03-28 18:02:27 +0000
+++ b/dbug/user.r	2009-06-05 12:05:26 +0000
@@ -32,6 +32,7 @@
 .\"           === Set line length
 .\".ll 6.5i
 .TL
+.warn 0
 D B U G
 .P 0
 C Program Debugging Package

=== modified file 'strings/ctype.c'
--- a/strings/ctype.c	2008-12-23 14:08:04 +0000
+++ b/strings/ctype.c	2009-06-05 12:05:26 +0000
@@ -327,7 +327,10 @@ my_string_repertoire(CHARSET_INFO *cs, c
   {
     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;


Attachment: [text/bzr-bundle] bzr/[e-mail]