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

kent@mysql.com · kent@mysql.com · commit 37788da79059 · 2005-11-06T02:19:51.000+01:00
diff --git a/cmd-line-utils/readline/complete.c b/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
 
diff --git a/include/my_bitmap.h b/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);
diff --git a/mysql-test/t/disabled.def b/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
diff --git a/mysys/base64.c b/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;
 }
 
 
diff --git a/sql/handler.h b/sql/handler.h
@@ -491,7 +491,6 @@ typedef struct {
   longlong list_value;
   uint partition_id;
 } LIST_PART_ENTRY;
-enum Item_result;
 
 class partition_info;
 
diff --git a/storage/bdb/Makefile.in b/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@
 
diff --git a/storage/bdb/build_unix/.IGNORE_ME b/storage/bdb/build_unix/.IGNORE_ME
@@ -0,0 +1,3 @@
+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.

Original file line number	Diff line number	Diff line change
`@@ -96,25 +96,25 @@ extern void bitmap_lock_invert(MY_BITMAP *map);`
`96`	`96`	`#define _bitmap_is_set(MAP, BIT) (((uchar*)(MAP)->bitmap)[(BIT) / 8] \`
`97`	`97`	`& (1 << ((BIT) & 7)))`
`98`	`98`	`#ifndef DBUG_OFF`
`99`		`-inline uint32`
	`99`	`+static inline uint32`
`100`	`100`	`bitmap_set_bit(MY_BITMAP *map,uint bit)`
`101`	`101`	`{`
`102`	`102`	`DBUG_ASSERT(bit < (map)->n_bits);`
`103`	`103`	`return _bitmap_set_bit(map,bit);`
`104`	`104`	`}`
`105`		`-inline uint32`
	`105`	`+static inline uint32`
`106`	`106`	`bitmap_flip_bit(MY_BITMAP *map,uint bit)`
`107`	`107`	`{`
`108`	`108`	`DBUG_ASSERT(bit < (map)->n_bits);`
`109`	`109`	`return _bitmap_flip_bit(map,bit);`
`110`	`110`	`}`
`111`		`-inline uint32`
	`111`	`+static inline uint32`
`112`	`112`	`bitmap_clear_bit(MY_BITMAP *map,uint bit)`
`113`	`113`	`{`
`114`	`114`	`DBUG_ASSERT(bit < (map)->n_bits);`
`115`	`115`	`return _bitmap_clear_bit(map,bit);`
`116`	`116`	`}`
`117`		`-inline uint32`
	`117`	`+static inline uint32`
`118`	`118`	`bitmap_is_set(const MY_BITMAP *map,uint bit)`
`119`	`119`	`{`
`120`	`120`	`DBUG_ASSERT(bit < (map)->n_bits);`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */`
`16`	`16`
`17`	`17`	`#include <base64.h>`
`18`		`-#include <m_string.h> // strchr()`
	`18`	`+#include <m_string.h> /* strchr() */`
`19`	`19`
`20`	`20`	`#ifndef MAIN`
`21`	`21`
`@@ -134,7 +134,8 @@ base64_decode(const char src, size_t size, void dst)`
`134`	`134`	`{`
`135`	`135`	`char b[3];`
`136`	`136`	`size_t i= 0;`
`137`		`- unsigned char d= (unsigned char)dst;`
	`137`	`+ char dst_base= (char )dst;`
	`138`	`+ char *d= dst_base;`
`138`	`139`	`size_t j;`
`139`	`140`
`140`	`141`	`while (i < size)`
`@@ -193,7 +194,7 @@ base64_decode(const char src, size_t size, void dst)`
`193`	`194`	`{`
`194`	`195`	`return -1;`
`195`	`196`	`}`
`196`		`- return d - (unsigned char*)dst;`
	`197`	`+ return d - dst_base;`
`197`	`198`	`}`
`198`	`199`
`199`	`200`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+Some combinations of the gzip and tar archive exploders found`
	`2`	`+on Linux systems ignore directories that don't have any files`
	`3`	`+(other than symbolic links) in them. So, here's a file.`