Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql

dbug/dbug.c

@@ -1365,7 +1365,7 @@ uint _line_)
 #ifdef THREAD
     (void) fprintf (_db_fp_, "%-7s: ", my_thread_name());
 #else
-    (void) fprintf (_db_fp_, "%5d: ", getpid ());
+    (void) fprintf (_db_fp_, "%5d: ", (int) getpid ());
 #endif
   }
   if (stack -> flags & NUMBER_ON) {

include/heap.h

@@ -112,13 +112,13 @@ typedef struct st_heap_share
   LIST open_list;
 } HP_SHARE;
 
-struct st_hash_info;
+struct st_hp_hash_info;
 
 typedef struct st_heap_info
 {
   HP_SHARE *s;
   byte *current_ptr;
-  struct st_hash_info *current_hash_ptr;
+  struct st_hp_hash_info *current_hash_ptr;
   ulong current_record,next_block;
   int lastinx,errkey;
   int  mode;				/* Mode of file (READONLY..) */

strings/conf_to_src.c

@@ -80,7 +80,7 @@ print_array(FILE *f, const char *set, const char *name, int n)
     endptr = p;
     for (;;)
     {
-      while (isspace(*endptr))
+      while (isspace((* (unsigned char*) endptr)))
         ++endptr;
       if (*endptr && *endptr != '#')    /* not comment */
         break;
@@ -90,7 +90,7 @@ print_array(FILE *f, const char *set, const char *name, int n)
     }
 
     p = val;
-    while (!isspace(*endptr))
+    while (!isspace((* (unsigned char*) endptr)))
       *p++ = *endptr++;
     *p = '\0';
     p = endptr;