bk commit into 5.1 tree (msvensson:1.2330)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson 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, 2006-09-15 17:00:09+02:00, msvensson@shellback.(none) +2 -0
  Merge shellback.(none):/home/msvensson/mysql/work/my50-work
  into  shellback.(none):/home/msvensson/mysql/work/my51-work
  MERGE: 1.1810.1697.148

  configure.in@stripped, 2006-09-15 16:59:10+02:00, msvensson@shellback.(none) +0 -0
    Auto merged
    MERGE: 1.245.1.152

  storage/ndb/include/ndb_global.h.in@stripped, 2006-09-15 17:00:06+02:00,
msvensson@shellback.(none) +0 -0
    SCCS merged
    MERGE: 1.9.1.2

  storage/ndb/include/ndb_global.h.in@stripped, 2006-09-15 16:59:10+02:00,
msvensson@shellback.(none) +0 -0
    Merge rename: ndb/include/ndb_global.h.in -> storage/ndb/include/ndb_global.h.in

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/work/my51-work/RESYNC

--- 1.383/configure.in	2006-09-15 17:00:24 +02:00
+++ 1.384/configure.in	2006-09-15 17:00:24 +02:00
@@ -1861,7 +1861,7 @@
 
 # isinf() could be a function or a macro (HPUX)
 AC_MSG_CHECKING(for isinf with <math.h>)
-AC_TRY_LINK([#include <math.h>], [float f = 0.0; isinf(f)],
+AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
  AC_MSG_RESULT(yes)
  AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]),
  AC_MSG_RESULT(no))

--- 1.9.1.1/ndb/include/ndb_global.h.in	2006-09-15 17:00:24 +02:00
+++ 1.13/storage/ndb/include/ndb_global.h.in	2006-09-15 17:00:24 +02:00
@@ -17,6 +17,7 @@
 #ifndef NDB_GLOBAL_H
 #define NDB_GLOBAL_H
 
+#include <my_config.h>
 #include <ndb_types.h>
 
 #define NDB_PORT "@ndb_port@"
@@ -130,6 +131,14 @@
 
 #ifndef PATH_MAX
 #define PATH_MAX 1024
+#endif
+
+#ifndef MIN
+#define MIN(x,y) (((x)<(y))?(x):(y))
+#endif
+
+#ifndef MAX
+#define MAX(x,y) (((x)>(y))?(x):(y))
 #endif
 
 #endif