Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
19618b53
Commit
19618b53
authored
17 years ago
by
msvensson@pilot.blaudden
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
parents
1a2e798a
47d3829f
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
14 deletions
+21
-14
configure.in
configure.in
+13
-5
include/my_global.h
include/my_global.h
+5
-6
sql/item_func.cc
sql/item_func.cc
+2
-2
strings/strtod.c
strings/strtod.c
+1
-1
No files found.
configure.in
View file @
19618b53
...
@@ -2006,12 +2006,20 @@ case "$target" in
...
@@ -2006,12 +2006,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
"
...
...
This diff is collapsed.
Click to expand it.
include/my_global.h
View file @
19618b53
...
@@ -792,12 +792,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
...
@@ -792,12 +792,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. */
...
...
This diff is collapsed.
Click to expand it.
sql/item_func.cc
View file @
19618b53
...
@@ -1980,9 +1980,9 @@ double my_double_round(double value, longlong dec, bool dec_unsigned,
...
@@ -1980,9 +1980,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
)
{
{
...
...
This diff is collapsed.
Click to expand it.
strings/strtod.c
View file @
19618b53
...
@@ -194,7 +194,7 @@ double my_strtod(const char *str, char **end_ptr, int *error)
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment