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
f3f1e53e
Commit
f3f1e53e
authored
Aug 26, 2002
by
monty@hundin.mysql.fi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix for HPUX to not use -lc_r library.
Fixed hangup problem in net_clear() on HPUX and Windows.
parent
7229f853
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
5 deletions
+10
-5
Build-tools/Do-compile
Build-tools/Do-compile
+2
-2
configure.in
configure.in
+2
-2
vio/viosocket.c
vio/viosocket.c
+6
-1
No files found.
Build-tools/Do-compile
View file @
f3f1e53e
...
@@ -254,7 +254,7 @@ if (!$opt_no_test)
...
@@ -254,7 +254,7 @@ if (!$opt_no_test)
$extra
=
"";
$extra
=
"";
if
(
$opt_bdb
)
if
(
$opt_bdb
)
{
{
$extra
.=
"
-
O bdb_cache_size=16M
";
$extra
.=
"
-
-bdb_cache_size=16M --bdb_max_lock=60000
"
}
}
if
(
$opt_innodb
)
if
(
$opt_innodb
)
{
{
...
...
configure.in
View file @
f3f1e53e
...
@@ -1315,11 +1315,11 @@ AC_CHECK_LIB(pthread,strtok_r)
...
@@ -1315,11 +1315,11 @@ AC_CHECK_LIB(pthread,strtok_r)
LIBS
=
"
$my_save_LIBS
"
LIBS
=
"
$my_save_LIBS
"
if
test
"
$ac_cv_lib_pthread_strtok_r
"
=
"no"
if
test
"
$ac_cv_lib_pthread_strtok_r
"
=
"no"
then
then
my_save_LIBS
=
"
$LIBS
"
AC_CHECK_LIB
(
c_r,strtok_r
)
AC_CHECK_LIB
(
c_r,strtok_r
)
case
"
$with_osf32_threads
---
$target_os
"
in
case
"
$with_osf32_threads
---
$target_os
"
in
# Don't keep -lc_r in LIBS; -pthread handles it magically
# Don't keep -lc_r in LIBS; -pthread handles it magically
yes---
*
|
*
---freebsd
*
)
LIBS
=
"
$my_save_LIBS
"
;;
yes---
*
|
*
---freebsd
*
|
*
---hpux
*
)
LIBS
=
"
$my_save_LIBS
"
;;
esac
esac
AC_CHECK_FUNCS
(
strtok_r pthread_init
)
AC_CHECK_FUNCS
(
strtok_r pthread_init
)
else
else
...
...
vio/viosocket.c
View file @
f3f1e53e
...
@@ -123,7 +123,6 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode,
...
@@ -123,7 +123,6 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode,
#if !defined(HAVE_OPENSSL)
#if !defined(HAVE_OPENSSL)
#if !defined(___WIN__) && !defined(__EMX__)
#if !defined(___WIN__) && !defined(__EMX__)
#if !defined(NO_FCNTL_NONBLOCK)
#if !defined(NO_FCNTL_NONBLOCK)
if
(
vio
->
sd
>=
0
)
if
(
vio
->
sd
>=
0
)
{
{
int
old_fcntl
=
vio
->
fcntl_mode
;
int
old_fcntl
=
vio
->
fcntl_mode
;
...
@@ -134,6 +133,8 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode,
...
@@ -134,6 +133,8 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode,
if
(
old_fcntl
!=
vio
->
fcntl_mode
)
if
(
old_fcntl
!=
vio
->
fcntl_mode
)
r
=
fcntl
(
vio
->
sd
,
F_SETFL
,
vio
->
fcntl_mode
);
r
=
fcntl
(
vio
->
sd
,
F_SETFL
,
vio
->
fcntl_mode
);
}
}
#else
r
=
set_blocking_mode
?
0
:
1
;
#endif
/* !defined(NO_FCNTL_NONBLOCK) */
#endif
/* !defined(NO_FCNTL_NONBLOCK) */
#else
/* !defined(__WIN__) && !defined(__EMX__) */
#else
/* !defined(__WIN__) && !defined(__EMX__) */
#ifndef __EMX__
#ifndef __EMX__
...
@@ -155,6 +156,10 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode,
...
@@ -155,6 +156,10 @@ int vio_blocking(Vio * vio __attribute__((unused)), my_bool set_blocking_mode,
if
(
old_fcntl
!=
vio
->
fcntl_mode
)
if
(
old_fcntl
!=
vio
->
fcntl_mode
)
r
=
ioctlsocket
(
vio
->
sd
,
FIONBIO
,(
void
*
)
&
arg
,
sizeof
(
arg
));
r
=
ioctlsocket
(
vio
->
sd
,
FIONBIO
,(
void
*
)
&
arg
,
sizeof
(
arg
));
}
}
#ifndef __EMX__
else
r
=
test
(
!
(
vio
->
fcntl_mode
&
O_NONBLOCK
))
!=
set_blocking_mode
;
#endif
/* __EMX__ */
#endif
/* !defined(__WIN__) && !defined(__EMX__) */
#endif
/* !defined(__WIN__) && !defined(__EMX__) */
#endif
/* !defined (HAVE_OPENSSL) */
#endif
/* !defined (HAVE_OPENSSL) */
DBUG_PRINT
(
"exit"
,
(
"%d"
,
r
));
DBUG_PRINT
(
"exit"
,
(
"%d"
,
r
));
...
...
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