database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix for HPUX to not use -lc_r library.

Browse Source 
Fixed hangup problem in net_clear() on HPUX and Windows. 


Build-tools/Do-compile:
  Added --bdb-max-lock=60000 option when testing BDB tables.
configure.in:
  Fix for HPUX to not use -lc_r library.
vio/viosocket.c:
  Fixed hangup problem in net_clear() on HPUX and Windows.
This commit is contained in:
unknown
2002-08-26 12:28:49 +03:00
parent 5f19b0428e
commit 207e6ea598
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Build-tools/Do-compile
View File

@ -159,7 +159,7 @@ if ($opt_stage <= 1)
} }
if ($opt_with_other_libc) if ($opt_with_other_libc)
{ {
$opt_with_other_libc = "--with-other-libc=$opt_with_other_libc"; $opt_with_other_libc = "--with-other-libc=$opt_with_other_libc";
} }
if (!$opt_enable_shared) if (!$opt_enable_shared)
{ {
@ -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)
{ {

4
configure.in
View File

@ -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

7
vio/viosocket.c
View File

@ -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,
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,
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));