mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
- replaced all occurences of HPUX with HPUX10 (to be prepared for eventual
differences in HPUX11) acconfig.h: - fixed typo configure.in: - replaced HPUX -> HPUX10 - added -DHPUX11 (not being used yet) to hpux11 workarounds include/my_global.h: - replaced HPUX -> HPUX10 include/my_net.h: - replaced HPUX -> HPUX10 include/my_pthread.h: - replaced HPUX -> HPUX10 libmysql/libmysql.c: - replaced HPUX -> HPUX10 mysys/my_append.c: - replaced HPUX -> HPUX10 mysys/my_copy.c: - replaced HPUX -> HPUX10 mysys/my_pthread.c: - replaced HPUX -> HPUX10 mysys/my_redel.c: - replaced HPUX -> HPUX10 mysys/thr_alarm.c: - replaced HPUX -> HPUX10 sql/mini_client.cc: - replaced HPUX -> HPUX10 sql/mysqld.cc: - replaced HPUX -> HPUX10 strings/do_ctype.c: - replaced HPUX -> HPUX10
This commit is contained in:
unknown
parent
68a5932ab2
commit
6f043c359c
14 changed files with 24 additions and 24 deletions
|
|
@ -234,7 +234,7 @@
|
|||
#undef SPRINTF_RETURNS_INT
|
||||
#undef SPRINTF_RETURNS_GARBAGE
|
||||
|
||||
/* Needed to get large file supportat HPUX 10.20 */
|
||||
/* Needed to get large file support on HPUX 10.20 */
|
||||
#undef __STDC_EXT__
|
||||
|
||||
#undef STACK_DIRECTION
|
||||
|
|
|
|||
|
|
@ -914,8 +914,8 @@ case $SYSTEM_TYPE in
|
|||
;;
|
||||
*hpux10.20*)
|
||||
echo "Enabling workarounds for hpux 10.20"
|
||||
CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX"
|
||||
CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX"
|
||||
CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX10 -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX"
|
||||
CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX10 -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX"
|
||||
if test "$with_named_thread" = "no"
|
||||
then
|
||||
echo "Using --with-named-thread=-lpthread"
|
||||
|
|
@ -924,8 +924,8 @@ case $SYSTEM_TYPE in
|
|||
;;
|
||||
*hpux11.*)
|
||||
echo "Enabling workarounds for hpux 11"
|
||||
CFLAGS="$CFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
|
||||
CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
|
||||
CFLAGS="$CFLAGS -DHPUX11 -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
|
||||
CXXFLAGS="$CXXFLAGS -DHPUX11 -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT"
|
||||
if test "$with_named_thread" = "no"
|
||||
then
|
||||
echo "Using --with-named-thread=-lpthread"
|
||||
|
|
|
|||
|
|
@ -240,7 +240,7 @@
|
|||
#ifdef DONT_USE_FINITE /* HPUX 11.x has is_finite() */
|
||||
#undef HAVE_FINITE
|
||||
#endif
|
||||
#if defined(HPUX) && defined(_LARGEFILE64_SOURCE) && defined(THREAD)
|
||||
#if defined(HPUX10) && defined(_LARGEFILE64_SOURCE) && defined(THREAD)
|
||||
/* Fix bug in setrlimit */
|
||||
#undef setrlimit
|
||||
#define setrlimit cma_setrlimit64
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ void my_inet_ntoa(struct in_addr in, char *buf);
|
|||
Handling of gethostbyname_r()
|
||||
*/
|
||||
|
||||
#if !defined(HPUX)
|
||||
#if !defined(HPUX10)
|
||||
struct hostent;
|
||||
#endif /* HPUX */
|
||||
#if !defined(HAVE_GETHOSTBYNAME_R)
|
||||
|
|
@ -84,7 +84,7 @@ struct hostent *my_gethostbyname_r(const char *name,
|
|||
struct hostent *result, char *buffer,
|
||||
int buflen, int *h_errnop);
|
||||
#define my_gethostbyname_r_free()
|
||||
#if !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) && !defined(HPUX)
|
||||
#if !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) && !defined(HPUX10)
|
||||
#define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data)
|
||||
#endif /* !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */
|
||||
|
||||
|
|
|
|||
|
|
@ -428,7 +428,7 @@ struct tm *localtime_r(const time_t *clock, struct tm *res);
|
|||
|
||||
#endif /* defined(__WIN__) */
|
||||
|
||||
#if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
|
||||
#if defined(HPUX10) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
|
||||
#undef pthread_cond_timedwait
|
||||
#define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c))
|
||||
int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
||||
|
|
|
|||
|
|
@ -221,7 +221,7 @@ int my_connect(my_socket s, const struct sockaddr *name, uint namelen,
|
|||
{
|
||||
tv.tv_sec = (long) timeout;
|
||||
tv.tv_usec = 0;
|
||||
#if defined(HPUX) && defined(THREAD)
|
||||
#if defined(HPUX10) && defined(THREAD)
|
||||
if ((res = select(s+1, NULL, (int*) &sfds, NULL, &tv)) >= 0)
|
||||
break;
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include <sys/utime.h>
|
||||
#elif defined(HAVE_UTIME_H)
|
||||
#include <utime.h>
|
||||
#elif !defined(HPUX)
|
||||
#elif !defined(HPUX10)
|
||||
struct utimbuf {
|
||||
time_t actime;
|
||||
time_t modtime;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include <sys/utime.h>
|
||||
#elif defined(HAVE_UTIME_H)
|
||||
#include <utime.h>
|
||||
#elif !defined(HPUX)
|
||||
#elif !defined(HPUX10)
|
||||
#include <time.h>
|
||||
struct utimbuf {
|
||||
time_t actime;
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr)
|
|||
this has to be added here.
|
||||
****************************************************************************/
|
||||
|
||||
#if defined(HPUX) || defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT)
|
||||
#if defined(HPUX10) || defined(HAVE_BROKEN_PTHREAD_COND_TIMEDWAIT)
|
||||
|
||||
int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
|
||||
struct timespec *abstime)
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
#include <sys/utime.h>
|
||||
#elif defined(HAVE_UTIME_H)
|
||||
#include <utime.h>
|
||||
#elif !defined(HPUX)
|
||||
#elif !defined(HPUX10)
|
||||
struct utimbuf {
|
||||
time_t actime;
|
||||
time_t modtime;
|
||||
|
|
|
|||
|
|
@ -730,11 +730,11 @@ static pthread_cond_t COND_thread_count;
|
|||
static pthread_mutex_t LOCK_thread_count;
|
||||
static uint thread_count;
|
||||
|
||||
#ifdef HPUX
|
||||
#ifdef HPUX10
|
||||
typedef int * fd_set_ptr;
|
||||
#else
|
||||
typedef fd_set * fd_set_ptr;
|
||||
#endif /* HPUX */
|
||||
#endif /* HPUX10 */
|
||||
|
||||
static void *test_thread(void *arg)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -294,11 +294,11 @@ static int mc_sock_connect(my_socket s, const struct sockaddr *name,
|
|||
FD_SET(s, &sfds);
|
||||
tv.tv_sec = (long) to;
|
||||
tv.tv_usec = 0;
|
||||
#ifdef HPUX
|
||||
#ifdef HPUX10
|
||||
res = select(s+1, NULL, (int*) &sfds, NULL, &tv);
|
||||
#else
|
||||
res = select(s+1, NULL, &sfds, NULL, &tv);
|
||||
#endif
|
||||
#endif /* HPUX10 */
|
||||
if (res <= 0) /* Never became writable */
|
||||
return(-1);
|
||||
|
||||
|
|
|
|||
|
|
@ -2531,7 +2531,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused)))
|
|||
while (!abort_loop)
|
||||
{
|
||||
readFDs=clientFDs;
|
||||
#ifdef HPUX
|
||||
#ifdef HPUX10
|
||||
if (select(max_used_connection,(int*) &readFDs,0,0,0) < 0)
|
||||
continue;
|
||||
#else
|
||||
|
|
@ -2545,7 +2545,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused)))
|
|||
MAYBE_BROKEN_SYSCALL
|
||||
continue;
|
||||
}
|
||||
#endif /* HPUX */
|
||||
#endif /* HPUX10 */
|
||||
if (abort_loop)
|
||||
{
|
||||
MAYBE_BROKEN_SYSCALL;
|
||||
|
|
|
|||
|
|
@ -145,7 +145,7 @@ void init_case_convert()
|
|||
higher_pos= (uchar * ) "\217\216\231\232\220"; /* Extra chars to konv. */
|
||||
lower_pos= (uchar * ) "\206\204\224\201\202";
|
||||
#else
|
||||
#if defined(HPUX) && ASCII_BITS_USED == 8
|
||||
#if defined(HPUX10) && ASCII_BITS_USED == 8
|
||||
higher_pos= (uchar * ) "\xd0\xd8\xda\xdb\xdc\xd3";
|
||||
lower_pos= (uchar * ) "\xd4\xcc\xce\xdf\xc9\xd7";
|
||||
#else
|
||||
|
|
@ -160,7 +160,7 @@ void init_case_convert()
|
|||
lower_pos= (uchar * ) "{}|`~";
|
||||
#endif
|
||||
#endif /* USE_INTERNAL_CTYPE */
|
||||
#endif /* HPUX */
|
||||
#endif /* HPUX10 */
|
||||
#endif /* MSDOS */
|
||||
|
||||
while (*higher_pos)
|
||||
|
|
@ -176,7 +176,7 @@ void init_case_convert()
|
|||
higher_pos= (uchar *) "\217\216\231\232\220";
|
||||
lower_pos= (uchar *) "\216\217\231YE";
|
||||
#else
|
||||
#if defined(HPUX) && ASCII_BITS_USED == 8
|
||||
#if defined(HPUX10) && ASCII_BITS_USED == 8
|
||||
higher_pos= lower_pos= (uchar *) ""; /* Tecknen i r{tt ordning */
|
||||
#else
|
||||
#ifdef USE_ISO_8859_1 /* As in USG5 ICL-386 */
|
||||
|
|
@ -186,7 +186,7 @@ void init_case_convert()
|
|||
higher_pos= (uchar *) "][\\~`"; /* R{tt ordning p} tecknen */
|
||||
lower_pos= (uchar *) "[\\]YE"; /* Ordning enligt ascii */
|
||||
#endif /* USE_ISO_8859_1 */
|
||||
#endif /* HPUX */
|
||||
#endif /* HPUX10 */
|
||||
#endif /* MSDOS */
|
||||
|
||||
while (*higher_pos)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue