1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge polly.local:/home/kaa/src/maint/bug28240/my50-bug24240

Browse Source 
into  polly.local:/home/kaa/src/maint/bug28240/my51-bug24240
This commit is contained in:
kaa@polly.local 2007-05-10 17:07:27 +04:00
commit 722b690743
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.in
View File

@ -1929,12 +1929,20 @@ case "$target" in
;; ;;
esac esac
# isinf() could be a function or a macro (HPUX) # Check that isinf() is available in math.h and can be used in both C and C++
AC_MSG_CHECKING(for isinf with <math.h>) # 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_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]), AC_MSG_CHECKING(whether isinf() can be used in C++ code)
AC_MSG_RESULT(no)) 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" CFLAGS="$ORG_CFLAGS"

11
include/my_global.h
View File

@ -855,12 +855,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
#define isnan(x) ((x) != (x)) #define isnan(x) ((x) != (x))
#endif #endif
#if !defined(HAVE_ISINF) #ifdef HAVE_ISINF
/* The configure check for "isinf with math.h" has failed */ /* isinf() can be used in both C and C++ code */
#ifdef isinf #define my_isinf(X) isinf(X)
#undef isinf #else
#endif #define my_isinf(X) (!finite(X) && !isnan(X))
#define isinf(X) (!finite(X) && !isnan(X))
#endif #endif
/* Define missing math constants. */ /* Define missing math constants. */

4
sql/item_func.cc
View File

@ -2001,9 +2001,9 @@ double my_double_round(double value, longlong dec, bool dec_unsigned,
tmp=(abs_dec < array_elements(log_10) ? tmp=(abs_dec < array_elements(log_10) ?
log_10[abs_dec] : pow(10.0,(double) abs_dec)); log_10[abs_dec] : pow(10.0,(double) abs_dec));
if (dec_negative && isinf(tmp)) if (dec_negative && my_isinf(tmp))
tmp2= 0; tmp2= 0;
else if (!dec_negative && isinf(value * tmp)) else if (!dec_negative && my_isinf(value * tmp))
tmp2= value; tmp2= value;
else if (truncate) else if (truncate)
{ {

2
strings/strtod.c
View File

@ -194,7 +194,7 @@ double my_strtod(const char *str, char **end_ptr, int *error)
done: done:
*end_ptr= (char*) str; /* end of number */ *end_ptr= (char*) str; /* end of number */
if (overflow || isinf(result)) if (overflow || my_isinf(result))
{ {
result= DBL_MAX; result= DBL_MAX;
*error= EOVERFLOW; *error= EOVERFLOW;