bk commit into 5.1 tree (joerg:1.2517)

[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@stripped, 2007-06-01 17:43:48+02:00, joerg@debian.(none) +1 -0
  Avoid a compile error which arises from a redefinition of "inline":
  If it has been defined (by "configure", in "include/my_config.h"),
  then an "#undef" is needed to avoid a redefinition.
  
  This is needed to prevent a compile error of the debug server on AIX.

  mysys/mf_keycache.c@stripped, 2007-06-01 17:43:39+02:00, joerg@debian.(none) +3 -0
    It may happen, that "include/my_config.h" already contains a
      #define inline ...
    as created by "configure" (this happens on AIX).
    In this case, an "#undef" is needed to avoid a compile error.

# 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:	debian.(none)
# Root:	/M51/merge-5.1

--- 1.70/mysys/mf_keycache.c	2007-05-24 14:26:07 +02:00
+++ 1.71/mysys/mf_keycache.c	2007-06-01 17:43:39 +02:00
@@ -325,6 +325,9 @@
 #endif /* defined(KEYCACHE_DEBUG) */
 
 #if !defined(DBUG_OFF)
+#if defined(inline)
+#undef inline
+#endif
 #define inline  /* disabled inline for easier debugging */
 static int fail_block(BLOCK_LINK *block);
 static int fail_hlink(HASH_LINK *hlink);