Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvel

into  a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-marvel


client/mysqltest.c:
  Auto merged
mysys/my_quick.c:
  Auto merged
sql/sql_map.cc:
  Auto merged
strings/ctype-ucs2.c:
  Auto merged

sql/log.cc

@@ -4855,7 +4855,7 @@ void TC_LOG_MMAP::close()
   case 3:
     my_free((uchar*)pages, MYF(0));
   case 2:
-    my_munmap((uchar*)data, (size_t)file_length);
+    my_munmap((char*)data, (size_t)file_length);
   case 1:
     my_close(fd, MYF(0));
   }