Commit 7acf036d authored by nick@mysql.com's avatar nick@mysql.com

Merge nleippe@work.mysql.com:/home/bk/mysql-4.0

into mysql.com:/home/nick/mysql/repository/mysql-4.0
parents 325b6845 9b769dbd
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
#undef SPRINTF_RETURNS_INT #undef SPRINTF_RETURNS_INT
#undef SPRINTF_RETURNS_GARBAGE #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 __STDC_EXT__
#undef STACK_DIRECTION #undef STACK_DIRECTION
......
...@@ -914,8 +914,8 @@ case $SYSTEM_TYPE in ...@@ -914,8 +914,8 @@ case $SYSTEM_TYPE in
;; ;;
*hpux10.20*) *hpux10.20*)
echo "Enabling workarounds for hpux 10.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" 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 -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 -DHPUX10 -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX"
if test "$with_named_thread" = "no" if test "$with_named_thread" = "no"
then then
echo "Using --with-named-thread=-lpthread" echo "Using --with-named-thread=-lpthread"
...@@ -924,8 +924,8 @@ case $SYSTEM_TYPE in ...@@ -924,8 +924,8 @@ case $SYSTEM_TYPE in
;; ;;
*hpux11.*) *hpux11.*)
echo "Enabling workarounds for hpux 11" 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" 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 -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -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" if test "$with_named_thread" = "no"
then then
echo "Using --with-named-thread=-lpthread" echo "Using --with-named-thread=-lpthread"
......
...@@ -240,7 +240,7 @@ ...@@ -240,7 +240,7 @@
#ifdef DONT_USE_FINITE /* HPUX 11.x has is_finite() */ #ifdef DONT_USE_FINITE /* HPUX 11.x has is_finite() */
#undef HAVE_FINITE #undef HAVE_FINITE
#endif #endif
#if defined(HPUX) && defined(_LARGEFILE64_SOURCE) && defined(THREAD) #if defined(HPUX10) && defined(_LARGEFILE64_SOURCE) && defined(THREAD)
/* Fix bug in setrlimit */ /* Fix bug in setrlimit */
#undef setrlimit #undef setrlimit
#define setrlimit cma_setrlimit64 #define setrlimit cma_setrlimit64
......
...@@ -71,7 +71,7 @@ void my_inet_ntoa(struct in_addr in, char *buf); ...@@ -71,7 +71,7 @@ void my_inet_ntoa(struct in_addr in, char *buf);
Handling of gethostbyname_r() Handling of gethostbyname_r()
*/ */
#if !defined(HPUX) #if !defined(HPUX10)
struct hostent; struct hostent;
#endif /* HPUX */ #endif /* HPUX */
#if !defined(HAVE_GETHOSTBYNAME_R) #if !defined(HAVE_GETHOSTBYNAME_R)
...@@ -84,7 +84,7 @@ struct hostent *my_gethostbyname_r(const char *name, ...@@ -84,7 +84,7 @@ struct hostent *my_gethostbyname_r(const char *name,
struct hostent *result, char *buffer, struct hostent *result, char *buffer,
int buflen, int *h_errnop); int buflen, int *h_errnop);
#define my_gethostbyname_r_free() #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) #define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data)
#endif /* !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */ #endif /* !defined(HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE) */
......
...@@ -428,7 +428,7 @@ struct tm *localtime_r(const time_t *clock, struct tm *res); ...@@ -428,7 +428,7 @@ struct tm *localtime_r(const time_t *clock, struct tm *res);
#endif /* defined(__WIN__) */ #endif /* defined(__WIN__) */
#if defined(HPUX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS) #if defined(HPUX10) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
#undef pthread_cond_timedwait #undef pthread_cond_timedwait
#define pthread_cond_timedwait(a,b,c) my_pthread_cond_timedwait((a),(b),(c)) #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, 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, ...@@ -221,7 +221,7 @@ int my_connect(my_socket s, const struct sockaddr *name, uint namelen,
{ {
tv.tv_sec = (long) timeout; tv.tv_sec = (long) timeout;
tv.tv_usec = 0; 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) if ((res = select(s+1, NULL, (int*) &sfds, NULL, &tv)) >= 0)
break; break;
#else #else
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <sys/utime.h> #include <sys/utime.h>
#elif defined(HAVE_UTIME_H) #elif defined(HAVE_UTIME_H)
#include <utime.h> #include <utime.h>
#elif !defined(HPUX) #elif !defined(HPUX10)
struct utimbuf { struct utimbuf {
time_t actime; time_t actime;
time_t modtime; time_t modtime;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <sys/utime.h> #include <sys/utime.h>
#elif defined(HAVE_UTIME_H) #elif defined(HAVE_UTIME_H)
#include <utime.h> #include <utime.h>
#elif !defined(HPUX) #elif !defined(HPUX10)
#include <time.h> #include <time.h>
struct utimbuf { struct utimbuf {
time_t actime; time_t actime;
......
...@@ -435,7 +435,7 @@ int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr) ...@@ -435,7 +435,7 @@ int my_pthread_cond_init(pthread_cond_t *mp, const pthread_condattr_t *attr)
this has to be added here. 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, int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
struct timespec *abstime) struct timespec *abstime)
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <sys/utime.h> #include <sys/utime.h>
#elif defined(HAVE_UTIME_H) #elif defined(HAVE_UTIME_H)
#include <utime.h> #include <utime.h>
#elif !defined(HPUX) #elif !defined(HPUX10)
struct utimbuf { struct utimbuf {
time_t actime; time_t actime;
time_t modtime; time_t modtime;
......
...@@ -730,11 +730,11 @@ static pthread_cond_t COND_thread_count; ...@@ -730,11 +730,11 @@ static pthread_cond_t COND_thread_count;
static pthread_mutex_t LOCK_thread_count; static pthread_mutex_t LOCK_thread_count;
static uint thread_count; static uint thread_count;
#ifdef HPUX #ifdef HPUX10
typedef int * fd_set_ptr; typedef int * fd_set_ptr;
#else #else
typedef fd_set * fd_set_ptr; typedef fd_set * fd_set_ptr;
#endif /* HPUX */ #endif /* HPUX10 */
static void *test_thread(void *arg) static void *test_thread(void *arg)
{ {
......
...@@ -294,11 +294,11 @@ static int mc_sock_connect(my_socket s, const struct sockaddr *name, ...@@ -294,11 +294,11 @@ static int mc_sock_connect(my_socket s, const struct sockaddr *name,
FD_SET(s, &sfds); FD_SET(s, &sfds);
tv.tv_sec = (long) to; tv.tv_sec = (long) to;
tv.tv_usec = 0; tv.tv_usec = 0;
#ifdef HPUX #ifdef HPUX10
res = select(s+1, NULL, (int*) &sfds, NULL, &tv); res = select(s+1, NULL, (int*) &sfds, NULL, &tv);
#else #else
res = select(s+1, NULL, &sfds, NULL, &tv); res = select(s+1, NULL, &sfds, NULL, &tv);
#endif #endif /* HPUX10 */
if (res <= 0) /* Never became writable */ if (res <= 0) /* Never became writable */
return(-1); return(-1);
......
...@@ -2531,7 +2531,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused))) ...@@ -2531,7 +2531,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused)))
while (!abort_loop) while (!abort_loop)
{ {
readFDs=clientFDs; readFDs=clientFDs;
#ifdef HPUX #ifdef HPUX10
if (select(max_used_connection,(int*) &readFDs,0,0,0) < 0) if (select(max_used_connection,(int*) &readFDs,0,0,0) < 0)
continue; continue;
#else #else
...@@ -2545,7 +2545,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused))) ...@@ -2545,7 +2545,7 @@ pthread_handler_decl(handle_connections_sockets,arg __attribute__((unused)))
MAYBE_BROKEN_SYSCALL MAYBE_BROKEN_SYSCALL
continue; continue;
} }
#endif /* HPUX */ #endif /* HPUX10 */
if (abort_loop) if (abort_loop)
{ {
MAYBE_BROKEN_SYSCALL; MAYBE_BROKEN_SYSCALL;
......
...@@ -145,7 +145,7 @@ void init_case_convert() ...@@ -145,7 +145,7 @@ void init_case_convert()
higher_pos= (uchar * ) "\217\216\231\232\220"; /* Extra chars to konv. */ higher_pos= (uchar * ) "\217\216\231\232\220"; /* Extra chars to konv. */
lower_pos= (uchar * ) "\206\204\224\201\202"; lower_pos= (uchar * ) "\206\204\224\201\202";
#else #else
#if defined(HPUX) && ASCII_BITS_USED == 8 #if defined(HPUX10) && ASCII_BITS_USED == 8
higher_pos= (uchar * ) "\xd0\xd8\xda\xdb\xdc\xd3"; higher_pos= (uchar * ) "\xd0\xd8\xda\xdb\xdc\xd3";
lower_pos= (uchar * ) "\xd4\xcc\xce\xdf\xc9\xd7"; lower_pos= (uchar * ) "\xd4\xcc\xce\xdf\xc9\xd7";
#else #else
...@@ -160,7 +160,7 @@ void init_case_convert() ...@@ -160,7 +160,7 @@ void init_case_convert()
lower_pos= (uchar * ) "{}|`~"; lower_pos= (uchar * ) "{}|`~";
#endif #endif
#endif /* USE_INTERNAL_CTYPE */ #endif /* USE_INTERNAL_CTYPE */
#endif /* HPUX */ #endif /* HPUX10 */
#endif /* MSDOS */ #endif /* MSDOS */
while (*higher_pos) while (*higher_pos)
...@@ -176,7 +176,7 @@ void init_case_convert() ...@@ -176,7 +176,7 @@ void init_case_convert()
higher_pos= (uchar *) "\217\216\231\232\220"; higher_pos= (uchar *) "\217\216\231\232\220";
lower_pos= (uchar *) "\216\217\231YE"; lower_pos= (uchar *) "\216\217\231YE";
#else #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 */ higher_pos= lower_pos= (uchar *) ""; /* Tecknen i r{tt ordning */
#else #else
#ifdef USE_ISO_8859_1 /* As in USG5 ICL-386 */ #ifdef USE_ISO_8859_1 /* As in USG5 ICL-386 */
...@@ -186,7 +186,7 @@ void init_case_convert() ...@@ -186,7 +186,7 @@ void init_case_convert()
higher_pos= (uchar *) "][\\~`"; /* R{tt ordning p} tecknen */ higher_pos= (uchar *) "][\\~`"; /* R{tt ordning p} tecknen */
lower_pos= (uchar *) "[\\]YE"; /* Ordning enligt ascii */ lower_pos= (uchar *) "[\\]YE"; /* Ordning enligt ascii */
#endif /* USE_ISO_8859_1 */ #endif /* USE_ISO_8859_1 */
#endif /* HPUX */ #endif /* HPUX10 */
#endif /* MSDOS */ #endif /* MSDOS */
while (*higher_pos) while (*higher_pos)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment