bk commit into 5.1 tree (df:1.2526)

[Daniel Fischer]

Below is the list of changes that have just been committed into a local
5.1 repository of df. When df 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-05-23 10:51:27+02:00, df@stripped +4 -0
  Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
  into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
  MERGE: 1.1810.2870.51

  BitKeeper/deleted/.del-CMakeLists.txt~13@stripped, 2007-05-23 10:51:23+02:00,
df@stripped +0 -0
    Auto merged
    MERGE: 1.1.3.2

  BitKeeper/deleted/.del-CMakeLists.txt~13@stripped, 2007-05-23 10:51:23+02:00,
df@stripped +0 -0
    Merge rename: libmysql/CMakeLists.txt -> BitKeeper/deleted/.del-CMakeLists.txt~13

  configure.in@stripped, 2007-05-23 10:51:23+02:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.245.1.198

  include/my_global.h@stripped, 2007-05-23 10:51:23+02:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.96.1.45

  sql/item_func.cc@stripped, 2007-05-23 10:51:23+02:00, df@stripped +0 -0
    Auto merged
    MERGE: 1.270.1.69

# 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:	df
# Host:	pippilotta.erinye.com
# Root:	/shared/home/df/mysql/build/mysql-5.1-build/RESYNC

--- 1.460/configure.in	2007-05-14 15:17:40 +02:00
+++ 1.461/configure.in	2007-05-23 10:51:23 +02:00
@@ -1926,12 +1926,20 @@
     ;;
 esac
 
-# isinf() could be a function or a macro (HPUX)
-AC_MSG_CHECKING(for isinf with <math.h>)
+# Check that isinf() is available in math.h and can be used in both C and C++ 
+# code
+AC_MSG_CHECKING(for isinf in <math.h>)
 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))
+  AC_MSG_RESULT(yes)
+  AC_MSG_CHECKING(whether isinf() can be used in C++ code)
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  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))
+  AC_LANG_RESTORE,
+  AC_MSG_RESULT(no))
  
 CFLAGS="$ORG_CFLAGS"
 

--- 1.392/sql/item_func.cc	2007-05-15 16:03:50 +02:00
+++ 1.393/sql/item_func.cc	2007-05-23 10:51:23 +02:00
@@ -2023,9 +2023,9 @@
   tmp=(abs_dec < array_elements(log_10) ?
        log_10[abs_dec] : pow(10.0,(double) abs_dec));
 
-  if (dec_negative && isinf(tmp))
+  if (dec_negative && my_isinf(tmp))
     tmp2= 0;
-  else if (!dec_negative && isinf(value * tmp))
+  else if (!dec_negative && my_isinf(value * tmp))
     tmp2= value;
   else if (truncate)
   {

--- 1.168/include/my_global.h	2007-05-05 08:20:31 +02:00
+++ 1.169/include/my_global.h	2007-05-23 10:51:23 +02:00
@@ -867,12 +867,11 @@
 #define isnan(x) ((x) != (x))
 #endif
 
-#if !defined(HAVE_ISINF)
-/* The configure check for "isinf with math.h" has failed */
-#ifdef isinf
-#undef isinf
-#endif
-#define isinf(X) (!finite(X) && !isnan(X))
+#ifdef HAVE_ISINF
+/* isinf() can be used in both C and C++ code */
+#define my_isinf(X) isinf(X)
+#else
+#define my_isinf(X) (!finite(X) && !isnan(X))
 #endif
 
 /* Define missing math constants. */