diff options
| author | unknown <joerg@trift2.> | 2008-03-14 14:41:08 +0100 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2008-03-14 14:41:08 +0100 |
| commit | a31a2ae6987e339bbe823187eef10b6039823eba (patch) | |
| tree | 746b5fc46e851c97ebe023c635c68b475addab48 /include | |
| parent | 1e60006f891756ede472c9411883afcd924b1539 (diff) | |
| parent | f36c8297af12a04344157235a748e7608682d002 (diff) | |
| download | mariadb-git-a31a2ae6987e339bbe823187eef10b6039823eba.tar.gz | |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
client/mysqldump.c:
Auto merged
configure.in:
Auto merged
include/my_global.h:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_acl.cc:
Auto merged
sql/unireg.h:
Auto merged
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_global.h | 13 | ||||
| -rw-r--r-- | include/sql_common.h | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/include/my_global.h b/include/my_global.h index ef61324e9af..00d1ea25c7a 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -486,9 +486,6 @@ C_MODE_END #include <sys/stream.h> /* HPUX 10.20 defines ulong here. UGLY !!! */ #define HAVE_ULONG #endif -#ifdef DONT_USE_FINITE /* HPUX 11.x has is_finite() */ -#undef HAVE_FINITE -#endif #if defined(HPUX10) && defined(_LARGEFILE64_SOURCE) && defined(THREAD) /* Fix bug in setrlimit */ #undef setrlimit @@ -858,9 +855,13 @@ typedef SOCKET_SIZE_TYPE size_socket; #define SIZE_T_MAX ~((size_t) 0) #endif -#ifndef HAVE_FINITE +#ifndef isfinite +#ifdef HAVE_FINITE +#define isfinite(x) finite(x) +#else #define finite(x) (1.0 / fabs(x) > 0.0) -#endif +#endif /* HAVE_FINITE */ +#endif /* isfinite */ #ifndef HAVE_ISNAN #define isnan(x) ((x) != (x)) @@ -870,7 +871,7 @@ typedef SOCKET_SIZE_TYPE size_socket; /* 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)) +#define my_isinf(X) (!isfinite(X) && !isnan(X)) #endif /* Define missing math constants. */ diff --git a/include/sql_common.h b/include/sql_common.h index 56e7305130f..9e43d076ba9 100644 --- a/include/sql_common.h +++ b/include/sql_common.h @@ -15,6 +15,7 @@ extern const char *unknown_sqlstate; +extern const char *cant_connect_sqlstate; extern const char *not_error_sqlstate; #ifdef __cplusplus |