diff options
| -rwxr-xr-x | Build-tools/Do-all-build-steps | 2 | ||||
| -rw-r--r-- | bdb/include/db_ext.h | 208 | ||||
| -rw-r--r-- | bdb/include/mutex_ext.h | 31 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | libmysql/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysql/configure.in | 230 | ||||
| -rw-r--r-- | libmysql_r/Makefile.am | 2 | ||||
| -rw-r--r-- | sql/log_event.cc | 5 |
8 files changed, 13 insertions, 473 deletions
diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps index ccd437a3b7e..158c06a04a3 100755 --- a/Build-tools/Do-all-build-steps +++ b/Build-tools/Do-all-build-steps @@ -18,7 +18,7 @@ to_host=`hostname` cc=gcc ccc=gcc EXTRA_CONFIG="--without-perl" -AM_MAKEFLAGS="-j 2" +#AM_MAKEFLAGS="-j 2" echo "Building on $to_host" rm -rf $BD/* diff --git a/bdb/include/db_ext.h b/bdb/include/db_ext.h deleted file mode 100644 index efe25424791..00000000000 --- a/bdb/include/db_ext.h +++ /dev/null @@ -1,208 +0,0 @@ -/* DO NOT EDIT: automatically built by dist/s_include. */ -#ifndef _db_ext_h_ -#define _db_ext_h_ -#if defined(__cplusplus) -extern "C" { -#endif -int __crdel_fileopen_recover - __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); -int __crdel_metasub_recover - __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); -int __crdel_metapage_recover - __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); -int __crdel_delete_recover - __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); -int __crdel_rename_recover - __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); -int __db_open __P((DB *, - const char *, const char *, DBTYPE, u_int32_t, int)); -int __db_dbopen __P((DB *, const char *, u_int32_t, int, db_pgno_t)); -int __db_master_open __P((DB *, - const char *, u_int32_t, int, DB **)); -int __db_dbenv_setup __P((DB *, const char *, u_int32_t)); -int __db_close __P((DB *, u_int32_t)); -int __db_remove __P((DB *, const char *, const char *, u_int32_t)); -int __db_rename __P((DB *, - const char *, const char *, const char *, u_int32_t)); -int __db_metabegin __P((DB *, DB_LOCK *)); -int __db_metaend __P((DB *, - DB_LOCK *, int, int (*)(DB *, void *), void *)); -int __db_log_page __P((DB *, - const char *, DB_LSN *, db_pgno_t, PAGE *)); -int __db_backup_name __P((DB_ENV *, - const char *, char **, DB_LSN *)); -DB *__dblist_get __P((DB_ENV *, u_int32_t)); -int __db_testcopy __P((DB *, const char *)); -int __db_cursor __P((DB *, DB_TXN *, DBC **, u_int32_t)); -int __db_icursor - __P((DB *, DB_TXN *, DBTYPE, db_pgno_t, int, DBC **)); -int __db_cprint __P((DB *)); -int __db_fd __P((DB *, int *)); -int __db_get __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t)); -int __db_put __P((DB *, DB_TXN *, DBT *, DBT *, u_int32_t)); -int __db_sync __P((DB *, u_int32_t)); -int __db_c_close __P((DBC *)); -int __db_c_destroy __P((DBC *)); -int __db_c_count __P((DBC *, db_recno_t *, u_int32_t)); -int __db_c_del __P((DBC *, u_int32_t)); -int __db_c_dup __P((DBC *, DBC **, u_int32_t)); -int __db_c_newopd __P((DBC *, db_pgno_t, DBC **)); -int __db_c_get __P((DBC *, DBT *, DBT *, u_int32_t)); -int __db_c_put __P((DBC *, DBT *, DBT *, u_int32_t)); -int __db_duperr __P((DB *, u_int32_t)); -int __db_pgin __P((DB_ENV *, db_pgno_t, void *, DBT *)); -int __db_pgout __P((DB_ENV *, db_pgno_t, void *, DBT *)); -void __db_metaswap __P((PAGE *)); -int __db_byteswap __P((DB_ENV *, db_pgno_t, PAGE *, size_t, int)); -int __db_dispatch __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); -int __db_add_recovery __P((DB_ENV *, - int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops, void *), u_int32_t)); -int __deprecated_recover - __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); -int __db_txnlist_init __P((DB_ENV *, void *)); -int __db_txnlist_add __P((DB_ENV *, void *, u_int32_t, int32_t)); -int __db_txnlist_remove __P((void *, u_int32_t)); -int __db_txnlist_close __P((void *, int32_t, u_int32_t)); -int __db_txnlist_delete __P((DB_ENV *, - void *, char *, u_int32_t, int)); -void __db_txnlist_end __P((DB_ENV *, void *)); -int __db_txnlist_find __P((void *, u_int32_t)); -void __db_txnlist_gen __P((void *, int)); -int __db_txnlist_lsnadd __P((DB_ENV *, void *, DB_LSN *, u_int32_t)); -int __db_txnlist_lsnhead __P((void *, DB_LSN **)); -int __db_txnlist_lsninit __P((DB_ENV *, DB_TXNHEAD *, DB_LSN *)); -int __db_add_limbo __P((DB_ENV *, - void *, int32_t, db_pgno_t, int32_t)); -int __db_do_the_limbo __P((DB_ENV *, DB_TXNHEAD *)); -int __db_txnlist_pgnoadd __P((DB_ENV *, DB_TXNHEAD *, - int32_t, u_int8_t [DB_FILE_ID_LEN], char *, db_pgno_t)); -void __db_txnlist_print __P((void *)); - int __db_ditem __P((DBC *, PAGE *, u_int32_t, u_int32_t)); -int __db_pitem - __P((DBC *, PAGE *, u_int32_t, u_int32_t, DBT *, DBT *)); -int __db_relink __P((DBC *, u_int32_t, PAGE *, PAGE **, int)); -int __db_cursorchk __P((const DB *, u_int32_t, int)); -int __db_ccountchk __P((const DB *, u_int32_t, int)); -int __db_cdelchk __P((const DB *, u_int32_t, int, int)); -int __db_cgetchk __P((const DB *, DBT *, DBT *, u_int32_t, int)); -int __db_cputchk __P((const DB *, - const DBT *, DBT *, u_int32_t, int, int)); -int __db_closechk __P((const DB *, u_int32_t)); -int __db_delchk __P((const DB *, DBT *, u_int32_t, int)); -int __db_getchk __P((const DB *, const DBT *, DBT *, u_int32_t)); -int __db_joinchk __P((const DB *, DBC * const *, u_int32_t)); -int __db_joingetchk __P((const DB *, DBT *, u_int32_t)); -int __db_putchk - __P((const DB *, DBT *, const DBT *, u_int32_t, int, int)); -int __db_removechk __P((const DB *, u_int32_t)); -int __db_statchk __P((const DB *, u_int32_t)); -int __db_syncchk __P((const DB *, u_int32_t)); -int __db_join __P((DB *, DBC **, DBC **, u_int32_t)); -int __db_new __P((DBC *, u_int32_t, PAGE **)); -int __db_free __P((DBC *, PAGE *)); -int __db_lprint __P((DBC *)); -int __db_lget __P((DBC *, - int, db_pgno_t, db_lockmode_t, int, DB_LOCK *)); -int __dbh_am_chk __P((DB *, u_int32_t)); -#ifdef HAVE_RPC -int __dbcl_init __P((DB *, DB_ENV *, u_int32_t)); -#endif -int __db_goff __P((DB *, DBT *, - u_int32_t, db_pgno_t, void **, u_int32_t *)); -int __db_poff __P((DBC *, const DBT *, db_pgno_t *)); -int __db_ovref __P((DBC *, db_pgno_t, int32_t)); -int __db_doff __P((DBC *, db_pgno_t)); -int __db_moff __P((DB *, const DBT *, db_pgno_t, u_int32_t, - int (*)(DB *, const DBT *, const DBT *), int *)); -int __db_vrfy_overflow __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, - u_int32_t)); -int __db_vrfy_ovfl_structure - __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t, u_int32_t)); -int __db_safe_goff __P((DB *, VRFY_DBINFO *, db_pgno_t, - DBT *, void **, u_int32_t)); -void __db_loadme __P((void)); -int __db_dump __P((DB *, char *, char *)); -int __db_prnpage __P((DB *, db_pgno_t)); -int __db_prpage __P((DB *, PAGE *, u_int32_t)); -void __db_pr __P((u_int8_t *, u_int32_t)); -int __db_prdbt __P((DBT *, int, const char *, void *, - int (*)(void *, const void *), int, VRFY_DBINFO *)); -void __db_prflags __P((u_int32_t, const FN *, FILE *)); -const char *__db_pagetype_to_string __P((u_int32_t)); -int __db_prheader __P((DB *, char *, int, int, void *, - int (*)(void *, const void *), VRFY_DBINFO *, db_pgno_t)); -int __db_prfooter __P((void *, int (*)(void *, const void *))); -int __db_addrem_recover - __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); -int __db_big_recover - __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); -int __db_ovref_recover __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); -int __db_relink_recover - __P((DB_ENV *, DBT *, DB_LSN *, db_recops, void *)); -int __db_debug_recover __P((DB_ENV *, - DBT *, DB_LSN *, db_recops, void *)); -int __db_noop_recover __P((DB_ENV *, - DBT *, DB_LSN *, db_recops, void *)); -int __db_traverse_dup __P((DB *, - db_pgno_t, int (*)(DB *, PAGE *, void *, int *), void *)); -int __db_traverse_big __P((DB *, - db_pgno_t, int (*)(DB *, PAGE *, void *, int *), void *)); -int __db_reclaim_callback __P((DB *, PAGE *, void *, int *)); -int __db_ret __P((DB *, - PAGE *, u_int32_t, DBT *, void **, u_int32_t *)); -int __db_retcopy __P((DB *, DBT *, - void *, u_int32_t, void **, u_int32_t *)); -int __db_upgrade __P((DB *, const char *, u_int32_t)); -int __db_lastpgno __P((DB *, char *, DB_FH *, db_pgno_t *)); -int __db_31_offdup __P((DB *, char *, DB_FH *, int, db_pgno_t *)); -int __db_verify - __P((DB *, const char *, const char *, FILE *, u_int32_t)); -int __db_verify_callback __P((void *, const void *)); -int __db_verify_internal __P((DB *, const char *, - const char *, void *, int (*)(void *, const void *), u_int32_t)); -int __db_vrfy_datapage - __P((DB *, VRFY_DBINFO *, PAGE *, db_pgno_t, u_int32_t)); -int __db_vrfy_meta - __P((DB *, VRFY_DBINFO *, DBMETA *, db_pgno_t, u_int32_t)); -int __db_vrfy_struct_feedback __P((DB *, VRFY_DBINFO *)); -int __db_salvage __P((DB *, VRFY_DBINFO *, db_pgno_t, PAGE *, - void *, int (*)(void *, const void *), u_int32_t)); -int __db_vrfy_inpitem __P((DB *, PAGE *, - db_pgno_t, u_int32_t, int, u_int32_t, u_int32_t *, u_int32_t *)); -int __db_vrfy_duptype - __P((DB *, VRFY_DBINFO *, db_pgno_t, u_int32_t)); -int __db_salvage_duptree __P((DB *, VRFY_DBINFO *, db_pgno_t, - DBT *, void *, int (*)(void *, const void *), u_int32_t)); -int __db_salvage_subdbpg - __P((DB *, VRFY_DBINFO *, PAGE *, void *, - int (*)(void *, const void *), u_int32_t)); -int __db_vrfy_dbinfo_create - __P((DB_ENV *, u_int32_t, VRFY_DBINFO **)); -int __db_vrfy_dbinfo_destroy __P((VRFY_DBINFO *)); -int __db_vrfy_getpageinfo - __P((VRFY_DBINFO *, db_pgno_t, VRFY_PAGEINFO **)); -int __db_vrfy_putpageinfo __P((VRFY_DBINFO *, VRFY_PAGEINFO *)); -int __db_vrfy_pgset __P((DB_ENV *, u_int32_t, DB **)); -int __db_vrfy_pgset_get __P((DB *, db_pgno_t, int *)); -int __db_vrfy_pgset_inc __P((DB *, db_pgno_t)); -int __db_vrfy_pgset_dec __P((DB *, db_pgno_t)); -int __db_vrfy_pgset_next __P((DBC *, db_pgno_t *)); -int __db_vrfy_childcursor __P((VRFY_DBINFO *, DBC **)); -int __db_vrfy_childput - __P((VRFY_DBINFO *, db_pgno_t, VRFY_CHILDINFO *)); -int __db_vrfy_ccset __P((DBC *, db_pgno_t, VRFY_CHILDINFO **)); -int __db_vrfy_ccnext __P((DBC *, VRFY_CHILDINFO **)); -int __db_vrfy_ccclose __P((DBC *)); -int __db_vrfy_pageinfo_create __P((VRFY_PAGEINFO **)); -int __db_salvage_init __P((VRFY_DBINFO *)); -void __db_salvage_destroy __P((VRFY_DBINFO *)); -int __db_salvage_getnext - __P((VRFY_DBINFO *, db_pgno_t *, u_int32_t *)); -int __db_salvage_isdone __P((VRFY_DBINFO *, db_pgno_t)); -int __db_salvage_markdone __P((VRFY_DBINFO *, db_pgno_t)); -int __db_salvage_markneeded - __P((VRFY_DBINFO *, db_pgno_t, u_int32_t)); -#if defined(__cplusplus) -} -#endif -#endif /* _db_ext_h_ */ diff --git a/bdb/include/mutex_ext.h b/bdb/include/mutex_ext.h deleted file mode 100644 index 040a6615eef..00000000000 --- a/bdb/include/mutex_ext.h +++ /dev/null @@ -1,31 +0,0 @@ -/* DO NOT EDIT: automatically built by dist/s_include. */ -#ifndef _mutex_ext_h_ -#define _mutex_ext_h_ -#if defined(__cplusplus) -extern "C" { -#endif -int __db_fcntl_mutex_init __P((DB_ENV *, MUTEX *, u_int32_t)); -int __db_fcntl_mutex_lock __P((DB_ENV *, MUTEX *, DB_FH *)); -int __db_fcntl_mutex_unlock __P((DB_ENV *, MUTEX *)); -int __db_fcntl_mutex_destroy __P((MUTEX *)); -int __db_pthread_mutex_init __P((DB_ENV *, MUTEX *, u_int32_t)); -int __db_pthread_mutex_lock __P((DB_ENV *, MUTEX *)); -int __db_pthread_mutex_unlock __P((DB_ENV *, MUTEX *)); -int __db_pthread_mutex_destroy __P((MUTEX *)); -int __db_tas_mutex_init __P((DB_ENV *, MUTEX *, u_int32_t)); -int __db_tas_mutex_lock __P((DB_ENV *, MUTEX *)); -int __db_tas_mutex_unlock __P((DB_ENV *, MUTEX *)); -int __db_tas_mutex_destroy __P((MUTEX *)); -int __db_mutex_alloc __P((DB_ENV *, REGINFO *, MUTEX **)); -void __db_mutex_free __P((DB_ENV *, REGINFO *, MUTEX *)); -int __db_shreg_locks_record __P((DB_ENV *, MUTEX *, REGINFO *, - REGMAINT *)); -void __db_shreg_locks_clear __P((MUTEX *, REGINFO *, REGMAINT *)); -void __db_shreg_locks_destroy __P((REGINFO *, REGMAINT *)); -int __db_shreg_mutex_init __P((DB_ENV *, MUTEX *, u_int32_t, - u_int32_t, REGINFO *, REGMAINT *)); -void __db_shreg_maintinit __P((REGINFO *, void *addr, size_t)); -#if defined(__cplusplus) -} -#endif -#endif /* _mutex_ext_h_ */ diff --git a/configure.in b/configure.in index 989c296d7f5..6709c6be0fa 100644 --- a/configure.in +++ b/configure.in @@ -1255,6 +1255,12 @@ AC_ARG_WITH(client-ldflags, [CLIENT_EXTRA_LDFLAGS=]) AC_SUBST(CLIENT_EXTRA_LDFLAGS) +AC_ARG_WITH(lib-ccflags, + [ --with-lib-ccflags Extra CC options for libraries], + [LIB_EXTRA_CCFLAGS=$withval], + [LIB_EXTRA_CCFLAGS=]) +AC_SUBST(LIB_EXTRA_CCFLAGS) + # Avoid stupid bug on some OS AC_ARG_WITH(low-memory, [ --with-low-memory Try to use less memory to compile to avoid diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index 01cc438a72b..68c2022223e 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -18,7 +18,7 @@ # This file is public domain and comes with NO WARRANTY of any kind target = libmysqlclient.la -target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID +target_defs = -DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ LIBS = @CLIENT_LIBS@ INCLUDES = -I$(srcdir)/../include -I../include \ -I$(srcdir)/.. -I$(top_srcdir) -I.. diff --git a/libmysql/configure.in b/libmysql/configure.in deleted file mode 100644 index 22179a33971..00000000000 --- a/libmysql/configure.in +++ /dev/null @@ -1,230 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(libmysql.c) -dnl The version number should be autogenerated from the toplevel configure.in -AM_INIT_AUTOMAKE(libmysql, 3.23.11-alpha) -AM_CONFIG_HEADER(my_config.h) - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_LN_S -AC_PROG_RANLIB - -# We use libtool -AM_PROG_LIBTOOL - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS(sgtty.h sys/ioctl.h) -# Maybe some can be removed but I got sick of adding them on at a time -# /David -AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \ - memory.h pwd.h select.h \ - stdlib.h stddef.h \ - strings.h string.h synch.h sys/mman.h sys/socket.h \ - sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \ - unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h) - - -dnl Checks for typedefs, structures, and compiler characteristics. -AC_C_CONST -AC_C_INLINE -AC_CHECK_SIZEOF(char, 1) -if test "$ac_cv_sizeof_char" -eq 0 -then - AC_MSG_ERROR([No size for char type. -A likely cause for this could be that there isn't any static libraries -installed. You can verify this by checking if you have libm.a in /lib, -/usr/lib or some other standard place. If this is the problem, -install the static libraries and try again. If this isn't the -problem, examine config.log for possible errors. If you want to -report this include ALL system information and include at least the -last 20 rows from config.log!]) -fi -AC_CHECK_SIZEOF(int, 4) -if test "$ac_cv_sizeof_int" -eq 0 -then - AC_MSG_ERROR("No size for int type.") -fi -AC_CHECK_SIZEOF(long, 4) -if test "$ac_cv_sizeof_long" -eq 0 -then - AC_MSG_ERROR("No size for long type.") -fi -AC_CHECK_SIZEOF(long long, 8) -if test "$ac_cv_sizeof_long_long" -eq 0 -then - AC_MSG_ERROR("MySQL needs a long long type.") -fi -AC_TYPE_SIZE_T -AC_HEADER_TIME -AC_TYPE_UID_T - -# Do the system files define ulong -MYSQL_CHECK_ULONG -# Do the system files define uchar -MYSQL_CHECK_UCHAR -# Do the system files define uint -MYSQL_CHECK_UINT - -#---START: Used in for client configure -# Check base type of last arg to accept -MYSQL_TYPE_ACCEPT -#---END: - -dnl Checks for library functions. -AC_TYPE_SIGNAL -# Standard MySQL list -AC_CHECK_FUNCS(alarm bmove \ - chsize ftruncate rint finite fpsetmask fpresetsticky\ - cuserid fcntl fconvert \ - getrusage getpwuid getcwd getrlimit getwd index locking longjmp \ - perror pread realpath rename \ - socket strnlen madvise \ - strtoul strtoull snprintf tempnam thr_setconcurrency \ - gethostbyaddr_r gethostbyname_r getpwnam \ - bfill bzero bcmp strstr strpbrk strerror\ - tell atod memcpy memmove \ - setupterm strcasecmp sighold \ - vidattr setupterm lrand48 localtime_r \ - sigset sigthreadmask pthread_sigmask pthread_setprio pthread_setprio_np \ - pthread_setschedparam pthread_attr_setprio pthread_attr_setschedparam \ - pthread_attr_create pthread_getsequence_np pthread_attr_setstacksize \ - pthread_condattr_create rwlock_init \ - crypt dlopen dlerror fchmod getpass getpassphrase) - -# This is special for libmysql -AC_CHECK_FUNCS(strtok_r) - -#---START: Used in for client configure - -# Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris) -ac_save_CXXFLAGS="$CXXFLAGS" -AC_CACHE_CHECK([style of gethostname_r routines], mysql_cv_gethostname_style, -AC_LANG_SAVE -AC_LANG_CPLUSPLUS -if test "$ac_cv_prog_gxx" = "yes" -then - CXXFLAGS="$CXXFLAGS -Werror" -fi -AC_TRY_COMPILE( -[#ifndef SCO -#define _REENTRANT -#endif -#include <pthread.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <netdb.h>], -[int skr; - - int res = gethostbyname_r((const char *) 0, - (struct hostent*) 0, (char*) 0, 0, (struct hostent **) 0, &skr);], -mysql_cv_gethostname_style=glibc2, mysql_cv_gethostname_style=other)) -AC_LANG_RESTORE -CXXFLAGS="$ac_save_CXXFLAGS" -if test "$mysql_cv_gethostname_style" = "glibc2" -then - AC_DEFINE(HAVE_GLIBC2_STYLE_GETHOSTBYNAME_R) -fi - -if test "$with_mit_threads" = "no" -then - # Check definition of pthread_getspecific - AC_CACHE_CHECK("args to pthread_getspecific", mysql_cv_getspecific_args, - AC_TRY_COMPILE( -[#ifndef SCO -#define _REENTRANT -#endif -#define _POSIX_PTHREAD_SEMANTICS -#include <pthread.h> ], -[ void *pthread_getspecific(pthread_key_t key); -pthread_getspecific((pthread_key_t) NULL); ], -mysql_cv_getspecific_args=POSIX, mysql_cv_getspecific_args=other)) - if test "$mysql_cv_getspecific_args" = "other" - then - AC_DEFINE(HAVE_NONPOSIX_PTHREAD_GETSPECIFIC) - fi - - # Check definition of pthread_mutex_init - AC_CACHE_CHECK("args to pthread_mutex_init", mysql_cv_mutex_init_args, - AC_TRY_COMPILE( -[#ifndef SCO -#define _REENTRANT -#endif -#define _POSIX_PTHREAD_SEMANTICS -#include <pthread.h> ], -[ - pthread_mutexattr_t attr; - pthread_mutex_t mp; - pthread_mutex_init(&mp,&attr); ], -mysql_cv_mutex_init_args=POSIX, mysql_cv_mutex_init_args=other)) - if test "$mysql_cv_mutex_init_args" = "other" - then - AC_DEFINE(HAVE_NONPOSIX_PTHREAD_MUTEX_INIT) - fi -fi -#---END: - -#---START: Used in for client configure -# Check definition of readdir_r -AC_CACHE_CHECK("args to readdir_r", mysql_cv_readdir_r, -AC_TRY_LINK( -[#ifndef SCO -#define _REENTRANT -#endif -#define _POSIX_PTHREAD_SEMANTICS -#include <pthread.h> -#include <dirent.h>], -[ int readdir_r(DIR *dirp, struct dirent *entry, struct dirent **result); -readdir_r((DIR *) NULL, (struct dirent *) NULL, (struct dirent **) NULL); ], -mysql_cv_readdir_r=POSIX, mysql_cv_readdir_r=other)) -if test "$mysql_cv_readdir_r" = "POSIX" -then - AC_DEFINE(HAVE_READDIR_R) -fi - -# Check definition av posix sigwait() -AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait, -AC_TRY_LINK( -[#ifndef SCO -#define _REENTRANT -#endif -#define _POSIX_PTHREAD_SEMANTICS -#include <pthread.h> -#include <signal.h>], -[#ifndef _AIX -sigset_t set; -int sig; -sigwait(&set,&sig); -#endif], -mysql_cv_sigwait=POSIX, mysql_cv_sigwait=other)) -if test "$mysql_cv_sigwait" = "POSIX" -then - AC_DEFINE(HAVE_SIGWAIT) -fi - -if test "$mysql_cv_sigwait" != "POSIX" -then -unset mysql_cv_sigwait -# Check definition av posix sigwait() -AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait, -AC_TRY_LINK( -[#ifndef SCO -#define _REENTRANT -#endif -#define _POSIX_PTHREAD_SEMANTICS -#include <pthread.h> -#include <signal.h>], -[sigset_t set; -int sig; -sigwait(&set);], -mysql_cv_sigwait=NONPOSIX, mysql_cv_sigwait=other)) -if test "$mysql_cv_sigwait" = "NONPOSIX" -then - AC_DEFINE(HAVE_NONPOSIX_SIGWAIT) -fi -fi -#---END: - -AC_OUTPUT(Makefile) diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 92ff5151ad0..aa1d398f874 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -18,7 +18,7 @@ target = libmysqlclient_r.la -target_defs = -DDONT_USE_RAID +target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@ ## LIBS = @LIBS@ INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include \ diff --git a/sql/log_event.cc b/sql/log_event.cc index 521e0f7765f..c30d03adaf5 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -272,7 +272,10 @@ void Log_event::print_header(FILE* file) void Log_event::print_timestamp(FILE* file, time_t* ts) { - struct tm tm_tmp, *res; +#ifdef MYSQL_SERVER + struct tm tm_tmp; +#endif + struct tm *res; if (!ts) { ts = &when; |