Commit 91033f87 authored by monty@donna.mysql.com's avatar monty@donna.mysql.com
Browse files

Update to get 3.23.23 to compile

parent b637e10d

acconfig.h

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ 
/* READLINE: */

#undef HAVE_BSD_SIGNALS



/* ZLIB and compress: */

#undef HAVE_COMPRESS



/* Define if we are using OSF1 DEC threads */

#undef HAVE_DEC_THREADS

acinclude.m4

+19 −0
Original line number Diff line number Diff line
@@ -116,6 +116,25 @@ then 
fi

])



AC_DEFUN(MYSQL_CHECK_ZLIB_WITH_COMPRESS, [

save_LIBS="$LIBS"

LIBS="-l$1 $LIBS"

AC_CACHE_CHECK([if libz with compress], mysql_cv_compress,

[AC_TRY_LINK([#include <zlib.h>

#ifdef __cplusplus

extern "C"

#endif

],

[ return compress(0, (unsigned long*) 0, "", 0);

], mysql_cv_compress=yes, mysql_cv_compress=no)])

if test "$mysql_cv_compress" = "yes"

then

  AC_DEFINE(HAVE_COMPRESS)

else

  LIBS="$save_LIBS"

fi

])



#---START: Used in for client configure

AC_DEFUN(MYSQL_CHECK_ULONG,

[AC_MSG_CHECKING(for type ulong)

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ AC_CHECK_LIB(bind, bind) 
# For crypt() on Linux

AC_CHECK_LIB(crypt,crypt)

# For compress in zlib

AC_CHECK_LIB($with_named_zlib,compress)

MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib)



if test "$IS_LINUX" = "true"; then

  AC_MSG_CHECKING([for atomic operations])
@@ -1217,7 +1217,7 @@ AC_CHECK_FUNCS(alarm bmove \ 
 pthread_setschedparam pthread_attr_setprio pthread_attr_setschedparam \

 pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize \

 pthread_condattr_create rwlock_init pthread_rwlock_rdlock \

 crypt compress dlopen dlerror fchmod getpass getpassphrase initgroups)

 crypt dlopen dlerror fchmod getpass getpassphrase initgroups)



# Sanity check: We chould not have any fseeko symbol unless

# large_file_support=yes

include/my_pthread.h

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ int sigwait(const sigset_t *set, int *sig); 
#ifndef HAVE_NONPOSIX_SIGWAIT

#define my_sigwait(A,B) sigwait((A),(B))

#else

int my_sigwait(sigset_t *set,int *sig);

int my_sigwait(const sigset_t *set,int *sig);

#endif



#ifdef HAVE_NONPOSIX_PTHREAD_MUTEX_INIT

mysys/my_pthread.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ int my_pthread_create_detached=1; 


int my_sigwait(const sigset_t *set,int *sig)

{

  int signal=sigwait(set);

  int signal=sigwait((sigset_t*) set);

  if (signal < 0)

    return errno;

  *sig=signal;