Reapplied portability changes, from changesets by kent, joerg and msvensson

cmd-line-utils/readline/complete.c

@@ -33,7 +33,8 @@
 
 #include <fcntl.h>
 
-#if defined (HAVE_SYS_FILE_H)
+/* FreeBSD 5.3 will not declare u_int in sys/types.h, file.h needs it */
+#if defined (HAVE_SYS_FILE_H) && !defined(__FreeBSD__)
 #  include <sys/file.h>
 #endif
 

include/my_bitmap.h

@@ -96,25 +96,25 @@ extern void bitmap_lock_invert(MY_BITMAP *map);
 #define _bitmap_is_set(MAP, BIT) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \
                                   & (1 << ((BIT) & 7)))
 #ifndef DBUG_OFF
-inline uint32
+static inline uint32
 bitmap_set_bit(MY_BITMAP *map,uint bit)
 {
   DBUG_ASSERT(bit < (map)->n_bits);
   return _bitmap_set_bit(map,bit);
 }
-inline uint32
+static inline uint32
 bitmap_flip_bit(MY_BITMAP *map,uint bit)
 {
   DBUG_ASSERT(bit < (map)->n_bits);
   return _bitmap_flip_bit(map,bit);
 }
-inline uint32
+static inline uint32
 bitmap_clear_bit(MY_BITMAP *map,uint bit)
 {
   DBUG_ASSERT(bit < (map)->n_bits);
   return _bitmap_clear_bit(map,bit);
 }
-inline uint32
+static inline uint32
 bitmap_is_set(const MY_BITMAP *map,uint bit)
 {
   DBUG_ASSERT(bit < (map)->n_bits);

mysql-test/t/disabled.def

@@ -16,3 +16,4 @@ rpl_until       : Unstable test case, bug#12429
 rpl_deadlock    : Unstable test case, bug#12429
 kill            : Unstable test case, bug#9712
 archive_gis     : The test fails on 32bit Linux
+compress        : Magnus will fix

mysys/base64.c

@@ -15,7 +15,7 @@
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include <base64.h>
-#include <m_string.h>  // strchr()
+#include <m_string.h>  /* strchr() */
 
 #ifndef MAIN
 
@@ -134,7 +134,8 @@ base64_decode(const char *src, size_t size, void *dst)
 {
   char b[3];
   size_t i= 0;
-  unsigned char *d= (unsigned char*)dst;
+  char *dst_base= (char *)dst;
+  char *d= dst_base;
   size_t j;
 
   while (i < size)
@@ -193,7 +194,7 @@ base64_decode(const char *src, size_t size, void *dst)
   {
     return -1;
   }
-  return d - (unsigned char*)dst;
+  return d - dst_base;
 }
 
 

sql/handler.h

@@ -491,7 +491,6 @@ typedef struct {
   longlong list_value;
   uint partition_id;
 } LIST_PART_ENTRY;
-enum Item_result;
 
 class partition_info;
 

storage/bdb/Makefile.in

@@ -30,7 +30,7 @@ subdirs = btree build_vxworks build_win32 clib common cxx db dbinc \
   db_verify dbm dbreg dist env examples_c examples_cxx fileops hash \
 	hsearch hmac include java libdb_java lock log mp mutex os os_vxworks \
 	os_win32 perl.BerkeleyDB perl.DB_File qam rep rpc_client rpc_server tcl \
-	test txn xa
+	test txn xa sequence
 
 @SET_MAKE@
 

storage/bdb/build_unix/.IGNORE_ME

+Some combinations of the gzip and tar archive exploders found
+on Linux systems ignore directories that don't have any files
+(other than symbolic links) in them.  So, here's a file.