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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
1b2bd746
Commit
1b2bd746
authored
Sep 08, 2005
by
joerg@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.0
into mysql.com:/M40/mysql-4.0
parents
c364baff
54ceb62b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
7 deletions
+15
-7
configure.in
configure.in
+10
-7
include/my_global.h
include/my_global.h
+5
-0
No files found.
configure.in
View file @
1b2bd746
...
@@ -447,30 +447,33 @@ PS=$ac_cv_path_PS
...
@@ -447,30 +447,33 @@ PS=$ac_cv_path_PS
# Linux style
# Linux style
if
$PS
p
$$
2> /dev/null |
grep
$0
>
/dev/null
if
$PS
p
$$
2> /dev/null |
grep
$0
>
/dev/null
then
then
FIND_PROC
=
"
$PS
p
\$\$
PID | grep mysqld > /dev/null"
FIND_PROC
=
"
$PS
p
\$\$
PID | grep
-v grep | grep
mysqld > /dev/null"
# Solaris
# Solaris
elif
$PS
-fp
$$
2> /dev/null |
grep
$0
>
/dev/null
elif
$PS
-fp
$$
2> /dev/null |
grep
$0
>
/dev/null
then
then
FIND_PROC
=
"
$PS
-p
\$\$
PID | grep mysqld > /dev/null"
FIND_PROC
=
"
$PS
-p
\$\$
PID | grep
-v grep | grep
mysqld > /dev/null"
# BSD style
# BSD style
elif
$PS
-uaxww
2> /dev/null |
grep
$0
>
/dev/null
elif
$PS
-uaxww
2> /dev/null |
grep
$0
>
/dev/null
then
then
FIND_PROC
=
"
$PS
-uaxww | grep mysqld | grep
\"
\$\$
PID
\"
> /dev/null"
FIND_PROC
=
"
$PS
-uaxww | grep
-v grep | grep
mysqld | grep
\"
\$\$
PID
\"
> /dev/null"
# SysV style
# SysV style
elif
$PS
-ef
2> /dev/null |
grep
$0
>
/dev/null
elif
$PS
-ef
2> /dev/null |
grep
$0
>
/dev/null
then
then
FIND_PROC
=
"
$PS
-ef | grep mysqld | grep
\"
\$\$
PID
\"
> /dev/null"
FIND_PROC
=
"
$PS
-ef | grep
-v grep | grep
mysqld | grep
\"
\$\$
PID
\"
> /dev/null"
# Do anybody use this?
# Do anybody use this?
elif
$PS
$$
2> /dev/null |
grep
$0
>
/dev/null
elif
$PS
$$
2> /dev/null |
grep
$0
>
/dev/null
then
then
FIND_PROC
=
"
$PS
\$\$
PID | grep mysqld > /dev/null"
FIND_PROC
=
"
$PS
\$\$
PID | grep
-v grep | grep
mysqld > /dev/null"
else
else
case
$SYSTEM_TYPE
in
case
$SYSTEM_TYPE
in
*
freebsd
*
)
FIND_PROC
=
"
$PS
p
\$\$
PID | grep -v grep | grep mysqld > /dev/null"
;;
*
darwin
*
)
*
darwin
*
)
FIND_PROC
=
"
$PS
-uaxww | grep mysqld | grep
\"
\$\$
PID
\"
> /dev/null"
FIND_PROC
=
"
$PS
-uaxww | grep
-v grep | grep
mysqld | grep
\"
\$\$
PID
\"
> /dev/null"
;;
;;
*
cygwin
*
)
*
cygwin
*
)
FIND_PROC
=
"
$PS
-e | grep mysqld | grep
\"
\$\$
PID
\"
> /dev/null"
FIND_PROC
=
"
$PS
-e | grep
-v grep | grep
mysqld | grep
\"
\$\$
PID
\"
> /dev/null"
;;
;;
*
netware
*
|
*
modesto
*
)
*
netware
*
|
*
modesto
*
)
FIND_PROC
=
FIND_PROC
=
...
...
include/my_global.h
View file @
1b2bd746
...
@@ -297,6 +297,11 @@ C_MODE_END
...
@@ -297,6 +297,11 @@ C_MODE_END
#undef HAVE_FINITE
#undef HAVE_FINITE
#undef LONGLONG_MIN
/* These get wrongly defined in QNX 6.2 */
#undef LONGLONG_MIN
/* These get wrongly defined in QNX 6.2 */
#undef LONGLONG_MAX
/* standard system library 'limits.h' */
#undef LONGLONG_MAX
/* standard system library 'limits.h' */
#ifdef __cplusplus
#define HAVE_RINT
/* rint() and isnan() functions are not */
#define rint(a) std::rint(a)
/* visible in C++ scope due to an error */
#define isnan(a) std::isnan(a)
/* in the usr/include/math.h on QNX */
#endif
#endif
#endif
/* We can not live without the following defines */
/* We can not live without the following defines */
...
...
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