bk commit into 5.1 tree (joerg:1.1959)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
5.1 repository of joerg. When joerg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1959 05/11/04 12:14:37 joerg@stripped +1 -0
  "inline" functions (especially in header files) should be declared "static".

  include/my_bitmap.h
    1.19 05/11/04 12:14:32 joerg@stripped +4 -4
    "inline" functions (especially in header files) should be declared "static",
    or else we may get "multiply defined" when they are used in several modules.
    (Solaris compiler problem)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joerg
# Host:	trift2.
# Root:	/M51/clone-5.1

--- 1.18/include/my_bitmap.h	2005-07-19 21:56:06 +02:00
+++ 1.19/include/my_bitmap.h	2005-11-04 12:14:32 +01:00
@@ -96,25 +96,25 @@
 #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);