Skip to content

M
MariaDB
Commit a10bb898 authored by unknown's avatar unknown
Browse files
Options

Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql 


BitKeeper/etc/logging_ok:
  Auto converge
Docs/manual.texi:
  Auto merged
parents db3e8d48 14138a32
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 387 additions and 301 deletions
BitKeeper/etc/logging_ok
View file @ a10bb898
jani@prima.mysql.com jani@prima.mysql.com
jani@prima.mysql.fi jani@prima.mysql.fi
jcole@tetra.spaceapes.com
monty@donna.mysql.com monty@donna.mysql.com
monty@tik.mysql.com monty@tik.mysql.com
monty@work.mysql.com monty@work.mysql.com
...@@ -8,4 +9,3 @@ sasha@mysql.sashanet.com ...@@ -8,4 +9,3 @@ sasha@mysql.sashanet.com
sasha@work.mysql.com sasha@work.mysql.com
serg@serg.mysql.com serg@serg.mysql.com
tim@cane.mysql.fi tim@cane.mysql.fi
jcole@tetra.spaceapes.com
Docs/manual.texi
View file @ a10bb898
...@@ -20439,7 +20439,7 @@ The maximum size of one packet. The message buffer is initialized to ...@@ -20439,7 +20439,7 @@ The maximum size of one packet. The message buffer is initialized to
bytes when needed. This value by default is small, to catch big (possibly bytes when needed. This value by default is small, to catch big (possibly
wrong) packets. You must increase this value if you are using big wrong) packets. You must increase this value if you are using big
@code{BLOB} columns. It should be as big as the biggest @code{BLOB} you want @code{BLOB} columns. It should be as big as the biggest @code{BLOB} you want
to use. to use. The current protocol limits @code{max_allowed_packet} to 16M.
@item @code{max_binlog_cache_size}. If a multi-statement transaction @item @code{max_binlog_cache_size}. If a multi-statement transaction
requires more than this amount of memory, one will get the error requires more than this amount of memory, one will get the error
...@@ -39680,6 +39680,9 @@ For making @code{mysqlaccess} more secure. ...@@ -39680,6 +39680,9 @@ For making @code{mysqlaccess} more secure.
@item Konark IA-64 Centre of Persistent Systems Private Limited @item Konark IA-64 Centre of Persistent Systems Private Limited
@uref{http://www.pspl.co.in/konark/}. Help with the Win64 port of the @uref{http://www.pspl.co.in/konark/}. Help with the Win64 port of the
@strong{MySQL} server. @strong{MySQL} server.
@item Albert Chin-A-Young.
Configure updates for Tru64, large file support and better TCP wrappers
support.
@item Valueclick Inc. @item Valueclick Inc.
For sponsoring the optimize section in this manual. For sponsoring the optimize section in this manual.
@end table @end table
...@@ -39800,6 +39803,9 @@ though, so Version 3.23 is not released as a stable version yet. ...@@ -39800,6 +39803,9 @@ though, so Version 3.23 is not released as a stable version yet.
@appendixsubsec Changes in release 3.23.29 @appendixsubsec Changes in release 3.23.29
@itemize @bullet @itemize @bullet
@item @item
Configure updates for Tru64, large file support and better TCP wrappers
support. By Albert Chin-A-Young.
@item
Fixed bug in <=> operator. Fixed bug in <=> operator.
@item @item
Fixed bug in @code{REPLACE} with BDB tables. Fixed bug in @code{REPLACE} with BDB tables.
acinclude.m4
View file @ a10bb898
...@@ -740,8 +740,8 @@ dnl echo ["MYSQL_CHECK_INSTALLED_BDB ($1) ($2)"] ...@@ -740,8 +740,8 @@ dnl echo ["MYSQL_CHECK_INSTALLED_BDB ($1) ($2)"]
[.*#define[ ]*], [[ ][ ]*]) [.*#define[ ]*], [[ ][ ]*])
if test X"$bdb_version_ok" = Xyes; then if test X"$bdb_version_ok" = Xyes; then
save_LIBS="$LIBS" save_LDFLAGS="$LDFLAGS"
LIBS="-L$lib $LIBS" LDFLAGS="-L$lib $LDFLAGS"
AC_CHECK_LIB(db,db_env_create, [ AC_CHECK_LIB(db,db_env_create, [
bdb_dir_ok=installed bdb_dir_ok=installed
MYSQL_TOP_BUILDDIR([inc]) MYSQL_TOP_BUILDDIR([inc])
...@@ -749,7 +749,7 @@ dnl echo ["MYSQL_CHECK_INSTALLED_BDB ($1) ($2)"] ...@@ -749,7 +749,7 @@ dnl echo ["MYSQL_CHECK_INSTALLED_BDB ($1) ($2)"]
bdb_includes="-I$inc" bdb_includes="-I$inc"
bdb_libs="-L$lib -ldb" bdb_libs="-L$lib -ldb"
]) ])
LIBS="$save_LIBS" LDFLAGS="$save_LDFLAGS"
else else
bdb_dir_ok="$bdb_version_ok" bdb_dir_ok="$bdb_version_ok"
fi fi
...@@ -836,10 +836,7 @@ dnl --------------------------------------------------------------------------- ...@@ -836,10 +836,7 @@ dnl ---------------------------------------------------------------------------
dnl END OF MYSQL_CHECK_BDB SECTION dnl END OF MYSQL_CHECK_BDB SECTION
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl --------------------------------------------------------------------------- #serial 12
dnl Got this from the GNU tar 1.13.11 distribution
dnl by Paul Eggert <eggert@twinsun.com>
dnl ---------------------------------------------------------------------------
dnl By default, many hosts won't let programs access large files; dnl By default, many hosts won't let programs access large files;
dnl one must use special compiler options to get large-file access to work. dnl one must use special compiler options to get large-file access to work.
...@@ -849,122 +846,67 @@ dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html ...@@ -849,122 +846,67 @@ dnl http://www.sas.com/standards/large.file/x_open.20Mar96.html
dnl Written by Paul Eggert <eggert@twinsun.com>. dnl Written by Paul Eggert <eggert@twinsun.com>.
dnl Internal subroutine of AC_SYS_LARGEFILE. dnl Internal subroutine of AC_SYS_LARGEFILE.
dnl AC_SYS_LARGEFILE_FLAGS(FLAGSNAME) dnl AC_SYS_LARGEFILE_TEST_INCLUDES
AC_DEFUN(AC_SYS_LARGEFILE_FLAGS, AC_DEFUN(AC_SYS_LARGEFILE_TEST_INCLUDES,
[AC_CACHE_CHECK([for $1 value to request large file support], [[#include <sys/types.h>
ac_cv_sys_largefile_$1, int a[(off_t) 9223372036854775807 == 9223372036854775807 ? 1 : -1];
[if ($GETCONF LFS_$1) >conftest.1 2>conftest.2 && test ! -s conftest.2 ]])
then
ac_cv_sys_largefile_$1=`cat conftest.1`
else
ac_cv_sys_largefile_$1=no
ifelse($1, CFLAGS,
[case "$host_os" in
# HP-UX 10.20 requires -D__STDC_EXT__ with gcc 2.95.1.
changequote(, )dnl
hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
changequote([, ])dnl
if test "$GCC" = yes; then
ac_cv_sys_largefile_CFLAGS=-D__STDC_EXT__
fi
;;
# IRIX 6.2 and later require cc -n32.
changequote(, )dnl
irix6.[2-9]* | irix6.1[0-9]* | irix[7-9].* | irix[1-9][0-9]*)
changequote([, ])dnl
if test "$GCC" != yes; then
ac_cv_sys_largefile_CFLAGS=-n32
fi
esac
if test "$ac_cv_sys_largefile_CFLAGS" != no; then
ac_save_CC="$CC"
CC="$CC $ac_cv_sys_largefile_CFLAGS"
AC_TRY_LINK(, , , ac_cv_sys_largefile_CFLAGS=no)
CC="$ac_save_CC"
fi])
fi
rm -f conftest*])])
dnl Internal subroutine of AC_SYS_LARGEFILE. dnl Internal subroutine of AC_SYS_LARGEFILE.
dnl AC_SYS_LARGEFILE_SPACE_APPEND(VAR, VAL) dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE, CACHE-VAR, COMMENT, INCLUDES, FUNCTION-BODY)
AC_DEFUN(AC_SYS_LARGEFILE_SPACE_APPEND,
[case $2 in
no) ;;
?*)
case "[$]$1" in
'') $1=$2 ;;
*) $1=[$]$1' '$2 ;;
esac ;;
esac])
dnl Internal subroutine of AC_SYS_LARGEFILE.
dnl AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, CACHE-VAR, COMMENT, CODE-TO-SET-DEFAULT)
AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE, AC_DEFUN(AC_SYS_LARGEFILE_MACRO_VALUE,
[AC_CACHE_CHECK([for $1], $2, [AC_CACHE_CHECK([for $1 value needed for large files], $3,
[$2=no [$3=no
changequote(, )dnl AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES
$4 $5
for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do ,
case "$ac_flag" in [$6],
-D$1) ,
$2=1 ;; [AC_TRY_COMPILE([#define $1 $2]
-D$1=*) AC_SYS_LARGEFILE_TEST_INCLUDES
$2=`expr " $ac_flag" : '[^=]*=\(.*\)'` ;; $5
esac ,
done [$6],
changequote([, ])dnl [$3=$2])])])
]) if test "[$]$3" != no; then
if test "[$]$2" != no; then AC_DEFINE_UNQUOTED([$1], [$]$3, [$4])
AC_DEFINE_UNQUOTED([$1], [$]$2, [$3])
fi]) fi])
AC_DEFUN(AC_SYS_LARGEFILE, AC_DEFUN(AC_SYS_LARGEFILE,
[AC_REQUIRE([AC_CANONICAL_HOST]) [AC_ARG_ENABLE(largefile,
AC_ARG_ENABLE(largefile, [ --disable-largefile omit support for large files])
[ --disable-large-files Omit support for large files])
if test "$enable_largefile" != no; then if test "$enable_largefile" != no; then
AC_CHECK_TOOL(GETCONF, getconf)
AC_SYS_LARGEFILE_FLAGS(CFLAGS) AC_CACHE_CHECK([for special C compiler options needed for large files],
AC_SYS_LARGEFILE_FLAGS(LDFLAGS) ac_cv_sys_largefile_CC,
AC_SYS_LARGEFILE_FLAGS(LIBS) [ac_cv_sys_largefile_CC=no
if test "$GCC" != yes; then
for ac_flag in $ac_cv_sys_largefile_CFLAGS no; do # IRIX 6.2 and later do not support large files by default,
case "$ac_flag" in # so use the C compiler's -n32 option if that helps.
no) ;; AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, , ,
-D_FILE_OFFSET_BITS=*) ;; [ac_save_CC="$CC"
-D_LARGEFILE_SOURCE | -D_LARGEFILE_SOURCE=*) ;; CC="$CC -n32"
-D_LARGE_FILES | -D_LARGE_FILES=*) ;; AC_TRY_COMPILE(AC_SYS_LARGEFILE_TEST_INCLUDES, ,
-D?* | -I?*) ac_cv_sys_largefile_CC=' -n32')
AC_SYS_LARGEFILE_SPACE_APPEND(CPPFLAGS, "$ac_flag") ;; CC="$ac_save_CC"])
*) fi])
AC_SYS_LARGEFILE_SPACE_APPEND(CFLAGS, "$ac_flag") ;; if test "$ac_cv_sys_largefile_CC" != no; then
esac CC="$CC$ac_cv_sys_largefile_CC"
done fi
AC_SYS_LARGEFILE_SPACE_APPEND(LDFLAGS, "$ac_cv_sys_largefile_LDFLAGS")
AC_SYS_LARGEFILE_SPACE_APPEND(LIBS, "$ac_cv_sys_largefile_LIBS") AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS, 64,
AC_SYS_LARGEFILE_MACRO_VALUE(_FILE_OFFSET_BITS,
ac_cv_sys_file_offset_bits, ac_cv_sys_file_offset_bits,
[Number of bits in a file offset, on hosts where this is settable.], [Number of bits in a file offset, on hosts where this is settable.])
[case "$host_os" in AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE, 1,
# HP-UX 10.20 and later
hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
ac_cv_sys_file_offset_bits=64 ;;
esac])
AC_SYS_LARGEFILE_MACRO_VALUE(_LARGEFILE_SOURCE,
ac_cv_sys_largefile_source, ac_cv_sys_largefile_source,
[Define to make fseeko etc. visible, on some hosts.], [Define to make ftello visible on some hosts (e.g. HP-UX 10.20).],
[case "$host_os" in [#include <stdio.h>], [return !ftello;])
# HP-UX 10.20 and later AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES, 1,
hpux10.[2-9][0-9]* | hpux1[1-9]* | hpux[2-9][0-9]*)
ac_cv_sys_largefile_source=1 ;;
esac])
AC_SYS_LARGEFILE_MACRO_VALUE(_LARGE_FILES,
ac_cv_sys_large_files, ac_cv_sys_large_files,
[Define for large files, on AIX-style hosts.], [Define for large files, on AIX-style hosts.])
[case "$host_os" in AC_SYS_LARGEFILE_MACRO_VALUE(_XOPEN_SOURCE, 500,
# AIX 4.2 and later ac_cv_sys_xopen_source,
aix4.[2-9]* | aix4.1[0-9]* | aix[5-9].* | aix[1-9][0-9]*) [Define to make ftello visible on some hosts (e.g. glibc 2.1.3).],
ac_cv_sys_large_files=1 ;; [#include <stdio.h>], [return !ftello;])
esac])
fi fi
]) ])
configure.in
View file @ a10bb898
...@@ -413,43 +413,6 @@ AC_ARG_WITH(named-z-libs, ...@@ -413,43 +413,6 @@ AC_ARG_WITH(named-z-libs,
[ with_named_zlib=z ] [ with_named_zlib=z ]
) )
AC_MSG_CHECKING(whether to use libwrap)
AC_ARG_WITH(libwrap,
[ --with-libwrap[=PATH] Compile in libwrap (tcp_wrappers) support.],
[ case "$withval" in
no)
AC_MSG_RESULT(no)
;;
yes)
AC_MSG_RESULT(yes)
AC_CHECK_LIB(wrap, request_init, [
AC_DEFINE(LIBWRAP)
WRAPLIBS="-lwrap"
AC_DEFINE(HAVE_LIBWRAP) ])
;;
*)
AC_MSG_RESULT(yes)
AC_DEFINE(LIBWRAP)
if test -d "$withval"; then
WRAPLIBS="-L$withval -lwrap"
else
WRAPLIBS="$withval"
fi
AC_DEFINE(HAVE_LIBWRAP)
OLDLIBS="$LIBS"
LIBS="$WRAPLIBS $LIBS"
AC_TRY_LINK([ int allow_severity; int deny_severity; ],
[ hosts_access(); ],
[],
[ AC_MSG_ERROR(Could not find the $withval library. You must first install tcp_wrappers.) ])
LIBS="$OLDLIBS"
;;
esac ],
AC_MSG_RESULT(no)
)
AC_SUBST(WRAPLIBS)
# Make thread safe client # Make thread safe client
AC_ARG_ENABLE(thread-safe-client, AC_ARG_ENABLE(thread-safe-client,
[ --enable-thread-safe-client [ --enable-thread-safe-client
...@@ -507,8 +470,7 @@ AC_ARG_WITH(mysqld-user, ...@@ -507,8 +470,7 @@ AC_ARG_WITH(mysqld-user,
) )
AC_SUBST(MYSQLD_USER) AC_SUBST(MYSQLD_USER)
# Use Paul Eggerts macros from GNU tar to check for large file # Use Paul Eggert's macros to check for large file support
# support.
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
# Types that must be checked AFTER large file support is checked # Types that must be checked AFTER large file support is checked
...@@ -533,29 +495,61 @@ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \ ...@@ -533,29 +495,61 @@ AC_CHECK_HEADERS(fcntl.h float.h floatingpoint.h ieeefp.h limits.h \
# and defines HAVE_LIBM etc # and defines HAVE_LIBM etc
#-------------------------------------------------------------------- #--------------------------------------------------------------------
AC_CHECK_LIB(m, floor) AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
if test "$ac_cv_lib_m_floor" = "no" AC_CHECK_FUNC(gethostbyname_r, [], [
then AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
AC_CHECK_LIB(m, __infinity) AC_CHECK_LIB(nsl, gethostbyname_r))])
fi AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt))
AC_CHECK_LIB(nsl_r, gethostbyname_r) AC_CHECK_FUNC(yp_get_default_domain, ,
if test "$ac_cv_lib_nsl_r_gethostbyname_r" = "no" AC_CHECK_LIB(nsl, yp_get_default_domain))
then AC_CHECK_FUNC(p2open, , AC_CHECK_LIB(gen, p2open))
AC_CHECK_LIB(nsl, gethostbyname_r)
fi
LIBS_BEFORE_SOCKET=$LIBS
LIBS=
AC_CHECK_LIB(socket, socket)
LIBS_SOCKET=$LIBS
LIBS=
AC_CHECK_LIB(gen, p2open)
# This may get things to compile even if bind-8 is installed # This may get things to compile even if bind-8 is installed
AC_CHECK_LIB(bind, bind) AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind))
# For crypt() on Linux # For crypt() on Linux
AC_CHECK_LIB(crypt,crypt) AC_CHECK_FUNC(crypt, , AC_CHECK_LIB(crypt, crypt))
# For compress in zlib # For compress in zlib
MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib) MYSQL_CHECK_ZLIB_WITH_COMPRESS($with_named_zlib)
#--------------------------------------------------------------------
# Check for TCP wrapper support
#--------------------------------------------------------------------
AC_ARG_WITH(libwrap,
[ --with-libwrap[=DIR] Compile in libwrap (tcp_wrappers) support],[
case "$with_libwrap" in
no) : ;;
yes|*)
_cppflags=${CPPFLAGS}
_ldflags=${LDFLAGS}
if test "$with_libwrap" != "yes"; then
CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include"
LDFLAGS="${LDFLAGS} -L$with_libwrap/lib"
fi
_libs=${LIBS}
AC_CHECK_HEADER(tcpd.h,
LIBS="$LIBS -lwrap"
AC_MSG_CHECKING(for TCP wrappers library -lwrap)
AC_TRY_LINK([#include <tcpd.h>
int allow_severity = 0;
int deny_severity = 0;
struct request_info *req;
],[hosts_access (req)],
AC_MSG_RESULT(yes)
AC_DEFINE(LIBWRAP)
AC_DEFINE(HAVE_LIBWRAP)
WRAPLIBS="-L$with_libwrap/lib -lwrap",
AC_MSG_RESULT(no)
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
LDFLAGS=${_ldflags} LIBS=${_libs}
;;
esac
])
AC_SUBST(WRAPLIBS)
if test "$IS_LINUX" = "true"; then if test "$IS_LINUX" = "true"; then
AC_MSG_CHECKING([for atomic operations]) AC_MSG_CHECKING([for atomic operations])
...@@ -592,7 +586,7 @@ fi ...@@ -592,7 +586,7 @@ fi
# Check for gtty if termio.h doesn't exists # Check for gtty if termio.h doesn't exists
if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no" if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no"
then then
AC_CHECK_LIB(compat, gtty) AC_CHECK_FUNC(gtty, , AC_CHECK_LIB(compat, gtty))
fi fi
# We make a special variable for client library's to avoid including # We make a special variable for client library's to avoid including
# thread libs in the client. # thread libs in the client.
...@@ -1272,7 +1266,7 @@ then ...@@ -1272,7 +1266,7 @@ then
CXXFLAGS="$CXXFLAGS -Werror" CXXFLAGS="$CXXFLAGS -Werror"
fi fi
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#ifndef SCO [#if !defined(SCO) && !defined(__osf__)
#define _REENTRANT #define _REENTRANT
#endif #endif
#include <pthread.h> #include <pthread.h>
...@@ -1304,7 +1298,7 @@ then ...@@ -1304,7 +1298,7 @@ then
CXXFLAGS="$CXXFLAGS -Werror" CXXFLAGS="$CXXFLAGS -Werror"
fi fi
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#ifndef SCO [#if !defined(SCO) && !defined(__osf__)
#define _REENTRANT #define _REENTRANT
#endif #endif
#include <pthread.h> #include <pthread.h>
...@@ -1335,7 +1329,7 @@ then ...@@ -1335,7 +1329,7 @@ then
CXXFLAGS="$CXXFLAGS -Werror" CXXFLAGS="$CXXFLAGS -Werror"
fi fi
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#ifndef SCO [#if !defined(SCO) && !defined(__osf__)
#define _REENTRANT #define _REENTRANT
#endif #endif
#include <pthread.h> #include <pthread.h>
...@@ -1361,7 +1355,7 @@ then ...@@ -1361,7 +1355,7 @@ then
# Check definition of pthread_getspecific # Check definition of pthread_getspecific
AC_CACHE_CHECK("args to pthread_getspecific", mysql_cv_getspecific_args, AC_CACHE_CHECK("args to pthread_getspecific", mysql_cv_getspecific_args,
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#ifndef SCO [#if !defined(SCO) && !defined(__osf__)
#define _REENTRANT #define _REENTRANT
#endif #endif
#define _POSIX_PTHREAD_SEMANTICS #define _POSIX_PTHREAD_SEMANTICS
...@@ -1377,7 +1371,7 @@ mysql_cv_getspecific_args=POSIX, mysql_cv_getspecific_args=other)) ...@@ -1377,7 +1371,7 @@ mysql_cv_getspecific_args=POSIX, mysql_cv_getspecific_args=other))
# Check definition of pthread_mutex_init # Check definition of pthread_mutex_init
AC_CACHE_CHECK("args to pthread_mutex_init", mysql_cv_mutex_init_args, AC_CACHE_CHECK("args to pthread_mutex_init", mysql_cv_mutex_init_args,
AC_TRY_COMPILE( AC_TRY_COMPILE(
[#ifndef SCO [#if !defined(SCO) && !defined(__osf__)
#define _REENTRANT #define _REENTRANT
#endif #endif
#define _POSIX_PTHREAD_SEMANTICS #define _POSIX_PTHREAD_SEMANTICS
...@@ -1398,7 +1392,7 @@ fi ...@@ -1398,7 +1392,7 @@ fi
# Check definition of readdir_r # Check definition of readdir_r
AC_CACHE_CHECK("args to readdir_r", mysql_cv_readdir_r, AC_CACHE_CHECK("args to readdir_r", mysql_cv_readdir_r,
AC_TRY_LINK( AC_TRY_LINK(
[#ifndef SCO [#if !defined(SCO) && !defined(__osf__)
#define _REENTRANT #define _REENTRANT
#endif #endif
#define _POSIX_PTHREAD_SEMANTICS #define _POSIX_PTHREAD_SEMANTICS
...@@ -1415,7 +1409,7 @@ fi ...@@ -1415,7 +1409,7 @@ fi
# Check definition av posix sigwait() # Check definition av posix sigwait()
AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait, AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait,
AC_TRY_LINK( AC_TRY_LINK(
[#ifndef SCO [#if !defined(SCO) && !defined(__osf__)
#define _REENTRANT #define _REENTRANT
#endif #endif
#define _POSIX_PTHREAD_SEMANTICS #define _POSIX_PTHREAD_SEMANTICS
...@@ -1438,7 +1432,7 @@ unset mysql_cv_sigwait ...@@ -1438,7 +1432,7 @@ unset mysql_cv_sigwait
# Check definition av posix sigwait() # Check definition av posix sigwait()
AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait, AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait,
AC_TRY_LINK( AC_TRY_LINK(
[#ifndef SCO [#if !defined(SCO) && !defined(__osf__)
#define _REENTRANT #define _REENTRANT
#endif #endif
#define _POSIX_PTHREAD_SEMANTICS #define _POSIX_PTHREAD_SEMANTICS
...@@ -1458,7 +1452,7 @@ fi ...@@ -1458,7 +1452,7 @@ fi
# Check if pthread_attr_setscope() exists # Check if pthread_attr_setscope() exists
AC_CACHE_CHECK("for pthread_attr_setscope", mysql_cv_pthread_attr_setscope, AC_CACHE_CHECK("for pthread_attr_setscope", mysql_cv_pthread_attr_setscope,
AC_TRY_LINK( AC_TRY_LINK(
[#ifndef SCO [#if !defined(SCO) && !defined(__osf__)
#define _REENTRANT #define _REENTRANT
#endif #endif
#define _POSIX_PTHREAD_SEMANTICS #define _POSIX_PTHREAD_SEMANTICS
......
extra/my_print_defaults.c
View file @ a10bb898
...@@ -34,7 +34,7 @@ static struct option long_options[] = ...@@ -34,7 +34,7 @@ static struct option long_options[] =
{"defaults-file", required_argument, 0, 'c'}, {"defaults-file", required_argument, 0, 'c'},
{"defaults-extra-file", required_argument, 0, 'e'}, {"defaults-extra-file", required_argument, 0, 'e'},
{"extra-file", required_argument, 0, 'e'}, {"extra-file", required_argument, 0, 'e'},
{"no-defaults", no_argument, 0, 'd'}, {"no-defaults", no_argument, 0, 'n'},
{"help", no_argument, 0, '?'}, {"help", no_argument, 0, '?'},
{"version", no_argument, 0, 'V'}, {"version", no_argument, 0, 'V'},
{0, 0, 0, 0} {0, 0, 0, 0}
...@@ -42,7 +42,7 @@ static struct option long_options[] = ...@@ -42,7 +42,7 @@ static struct option long_options[] =
static void usage(my_bool version) static void usage(my_bool version)
{ {
printf("%s Ver 1.2 for %s at %s\n",my_progname,SYSTEM_TYPE, printf("%s Ver 1.3 for %s at %s\n",my_progname,SYSTEM_TYPE,
MACHINE_TYPE); MACHINE_TYPE);
if (version) if (version)
return; return;
...@@ -55,7 +55,7 @@ static void usage(my_bool version) ...@@ -55,7 +55,7 @@ static void usage(my_bool version)
-e, --extra-file=#, --defaults-extra-file=#\n\ -e, --extra-file=#, --defaults-extra-file=#\n\
Read this file after the global /etc config file and\n\ Read this file after the global /etc config file and\n\
before the config file in the users home directory.\n\ before the config file in the users home directory.\n\
--no-defaults Return an empty string (useful for scripts)\n\ -n, --no-defaults Return an empty string (useful for scripts)\n\
-?, --help Display this help message and exit.\n\ -?, --help Display this help message and exit.\n\
-V, --version Output version information and exit.\n", -V, --version Output version information and exit.\n",
config_file); config_file);
...@@ -66,7 +66,7 @@ static int get_options(int *argc,char ***argv) ...@@ -66,7 +66,7 @@ static int get_options(int *argc,char ***argv)
{ {
int c,option_index; int c,option_index;
while ((c=getopt_long(*argc,*argv,"c:e:V?I", while ((c=getopt_long(*argc,*argv,"nc:e:V?I",
long_options, &option_index)) != EOF) long_options, &option_index)) != EOF)
{ {
switch (c) { switch (c) {
......
include/my_pthread.h
View file @ a10bb898
...@@ -393,8 +393,8 @@ struct hostent *my_gethostbyname_r(const char *name, ...@@ -393,8 +393,8 @@ struct hostent *my_gethostbyname_r(const char *name,
#else #else
#ifdef HAVE_GETHOSTBYNAME_R_WITH_HOSTENT_DATA #ifdef HAVE_GETHOSTBYNAME_R_WITH_HOSTENT_DATA
#define GETHOSTBYNAME_BUFF_SIZE sizeof(hostent_data) #define GETHOSTBYNAME_BUFF_SIZE sizeof(struct hostent_data)
#define my_gethostbyname_r(A,B,C,D,E) gethostbyname_r((A),(B),(hostent_data*) (C)) #define my_gethostbyname_r(A,B,C,D,E) gethostbyname_r((A),(B),(struct hostent_data*) (C))
#else #else
#define GETHOSTBYNAME_BUFF_SIZE 2048 #define GETHOSTBYNAME_BUFF_SIZE 2048
#define my_gethostbyname_r(A,B,C,D,E) gethostbyname_r((A),(B),(C),(D),(E)) #define my_gethostbyname_r(A,B,C,D,E) gethostbyname_r((A),(B),(C),(D),(E))
......
ltconfig
View file @ a10bb898
This diff is collapsed.
ltmain.sh
View file @ a10bb898
...@@ -54,8 +54,8 @@ modename="$progname" ...@@ -54,8 +54,8 @@ modename="$progname"
# Constants. # Constants.
PROGRAM=ltmain.sh PROGRAM=ltmain.sh
PACKAGE=libtool PACKAGE=libtool
VERSION=1.3.3 VERSION=1.3.5
TIMESTAMP=" (1.385.2.181 1999/07/02 15:49:11)" TIMESTAMP=" (1.385.2.206 2000/05/27 11:12:27)"
default_mode= default_mode=
help="Try \`$progname --help' for more information." help="Try \`$progname --help' for more information."
...@@ -435,7 +435,7 @@ compiler." ...@@ -435,7 +435,7 @@ compiler."
fbsd_hideous_sh_bug=$base_compile fbsd_hideous_sh_bug=$base_compile
# All platforms use -DPIC, to notify preprocessed assembler code. # All platforms use -DPIC, to notify preprocessed assembler code.
command="$base_compile $pic_flag -DPIC $srcfile" command="$base_compile $srcfile $pic_flag -DPIC"
if test "$build_old_libs" = yes; then if test "$build_old_libs" = yes; then
lo_libobj="$libobj" lo_libobj="$libobj"
dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'` dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
...@@ -521,9 +521,17 @@ compiler." ...@@ -521,9 +521,17 @@ compiler."
exit $error exit $error
fi fi
xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test "X$xdir" = "X$obj"; then
xdir="."
else
xdir="$xdir"
fi
baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
# Now arrange that obj and lo_libobj become the same file # Now arrange that obj and lo_libobj become the same file
$show "$LN_S $obj $lo_libobj" $show "(cd $xdir && $LN_S $baseobj $libobj)"
if $run $LN_S $obj $lo_libobj; then if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
exit 0 exit 0
else else
error=$? error=$?
...@@ -613,8 +621,6 @@ compiler." ...@@ -613,8 +621,6 @@ compiler."
# libtool link mode # libtool link mode
link) link)
modename="$modename: link" modename="$modename: link"
C_compiler="$CC" # save it, to compile generated C sources
CC="$nonopt"
case "$host" in case "$host" in
*-*-cygwin* | *-*-mingw* | *-*-os2*) *-*-cygwin* | *-*-mingw* | *-*-os2*)
# It is impossible to link a dll without this setting, and # It is impossible to link a dll without this setting, and
...@@ -802,8 +808,8 @@ compiler." ...@@ -802,8 +808,8 @@ compiler."
allow_undefined=yes allow_undefined=yes
;; ;;
esac esac
compile_command="$CC" compile_command="$nonopt"
finalize_command="$CC" finalize_command="$nonopt"
compile_rpath= compile_rpath=
finalize_rpath= finalize_rpath=
...@@ -1789,9 +1795,10 @@ compiler." ...@@ -1789,9 +1795,10 @@ compiler."
*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*) *-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
# these systems don't actually have a c library (as such)! # these systems don't actually have a c library (as such)!
;; ;;
*-*-freebsd*) *-*-rhapsody*)
# FreeBSD needs to handle -lc (or -lc_r) itself # rhapsody is a little odd...
;; deplibs="$deplibs -framework System"
;;
*) *)
# Add libc to deplibs on all other systems. # Add libc to deplibs on all other systems.
deplibs="$deplibs -lc" deplibs="$deplibs -lc"
...@@ -1854,7 +1861,7 @@ compiler." ...@@ -1854,7 +1861,7 @@ compiler."
int main() { return 0; } int main() { return 0; }
EOF EOF
$rm conftest $rm conftest
$C_compiler -o conftest conftest.c $deplibs $CC -o conftest conftest.c $deplibs
if test $? -eq 0 ; then if test $? -eq 0 ; then
ldd_output=`ldd conftest` ldd_output=`ldd conftest`
for i in $deplibs; do for i in $deplibs; do
...@@ -1887,7 +1894,7 @@ EOF ...@@ -1887,7 +1894,7 @@ EOF
# If $name is empty we are operating on a -L argument. # If $name is empty we are operating on a -L argument.
if test "$name" != "" ; then if test "$name" != "" ; then
$rm conftest $rm conftest
$C_compiler -o conftest conftest.c $i $CC -o conftest conftest.c $i
# Did it work? # Did it work?
if test $? -eq 0 ; then if test $? -eq 0 ; then
ldd_output=`ldd conftest` ldd_output=`ldd conftest`
...@@ -2050,12 +2057,19 @@ EOF ...@@ -2050,12 +2057,19 @@ EOF
done done
# Ensure that we have .o objects for linkers which dislike .lo # Ensure that we have .o objects for linkers which dislike .lo
# (e.g. aix) incase we are running --disable-static # (e.g. aix) in case we are running --disable-static
for obj in $libobjs; do for obj in $libobjs; do
oldobj=`$echo "X$obj" | $Xsed -e "$lo2o"` xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
if test ! -f $oldobj; then if test "X$xdir" = "X$obj"; then
$show "${LN_S} $obj $oldobj" xdir="."
$run ${LN_S} $obj $oldobj || exit $? else
xdir="$xdir"
fi
baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
if test ! -f $xdir/$oldobj; then
$show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
$run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
fi fi
done done
...@@ -2314,8 +2328,16 @@ EOF ...@@ -2314,8 +2328,16 @@ EOF
# Just create a symlink. # Just create a symlink.
$show $rm $libobj $show $rm $libobj
$run $rm $libobj $run $rm $libobj
$show "$LN_S $obj $libobj" xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
$run $LN_S $obj $libobj || exit $? if test "X$xdir" = "X$libobj"; then
xdir="."
else
xdir="$xdir"
fi
baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
$show "(cd $xdir && $LN_S $oldobj $baseobj)"
$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
fi fi
if test -n "$gentop"; then if test -n "$gentop"; then
...@@ -2601,16 +2623,21 @@ static const void *lt_preloaded_setup() { ...@@ -2601,16 +2623,21 @@ static const void *lt_preloaded_setup() {
# linked before any other PIC object. But we must not use # linked before any other PIC object. But we must not use
# pic_flag when linking with -static. The problem exists in # pic_flag when linking with -static. The problem exists in
# FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
*-*-freebsd2*|*-*-freebsd3.0*) *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
case "$compile_command " in case "$compile_command " in
*" -static "*) ;; *" -static "*) ;;
*) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";; *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
esac;;
*-*-hpux*)
case "$compile_command " in
*" -static "*) ;;
*) pic_flag_for_symtable=" $pic_flag -DPIC";;
esac esac
esac esac
# Now compile the dynamic symbol file. # Now compile the dynamic symbol file.
$show "(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")" $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
$run eval '(cd $output_objdir && $C_compiler -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $? $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
# Clean up the generated files. # Clean up the generated files.
$show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T" $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
...@@ -2779,7 +2806,7 @@ sed_quote_subst='$sed_quote_subst' ...@@ -2779,7 +2806,7 @@ sed_quote_subst='$sed_quote_subst'
# The HP-UX ksh and POSIX shell print the target directory to stdout # The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set. # if CDPATH is set.
if test \"\${CDPATH+set}\" = set; then CDPATH=; export CDPATH; fi if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
relink_command=\"$relink_command\" relink_command=\"$relink_command\"
...@@ -2868,7 +2895,7 @@ else ...@@ -2868,7 +2895,7 @@ else
fi" fi"
else else
echo >> $output "\ echo >> $output "\
program='$outputname$exeext' program='$outputname'
progdir=\"\$thisdir/$objdir\" progdir=\"\$thisdir/$objdir\"
" "
fi fi
...@@ -2904,13 +2931,21 @@ else ...@@ -2904,13 +2931,21 @@ else
# Run the actual program with our arguments. # Run the actual program with our arguments.
" "
case $host in case $host in
*-*-cygwin* | *-*-mingw | *-*-os2*)
# win32 systems need to use the prog path for dll # win32 systems need to use the prog path for dll
# lookup to work # lookup to work
*-*-cygwin*)
$echo >> $output "\
exec \$progdir/\$program \${1+\"\$@\"}
"
;;
# Backslashes separate directories on plain windows
*-*-mingw | *-*-os2*)
$echo >> $output "\ $echo >> $output "\
exec \$progdir\\\\\$program \${1+\"\$@\"} exec \$progdir\\\\\$program \${1+\"\$@\"}
" "
;; ;;
*) *)
$echo >> $output "\ $echo >> $output "\
# Export the path to the program. # Export the path to the program.
...@@ -2998,14 +3033,21 @@ fi\ ...@@ -2998,14 +3033,21 @@ fi\
if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
eval cmds=\"$old_archive_from_new_cmds\" eval cmds=\"$old_archive_from_new_cmds\"
else else
# Ensure that we have .o objects in place incase we decided # Ensure that we have .o objects in place in case we decided
# not to build a shared library, and have fallen back to building # not to build a shared library, and have fallen back to building
# static libs even though --disable-static was passed! # static libs even though --disable-static was passed!
for oldobj in $oldobjs; do for oldobj in $oldobjs; do
if test ! -f $oldobj; then if test ! -f $oldobj; then
obj=`$echo "X$oldobj" | $Xsed -e "$o2lo"` xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
$show "${LN_S} $obj $oldobj" if test "X$xdir" = "X$oldobj"; then
$run ${LN_S} $obj $oldobj || exit $? xdir="."
else
xdir="$xdir"
fi
baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
$show "(cd $xdir && ${LN_S} $obj $baseobj)"
$run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
fi fi
done done
...@@ -3675,8 +3717,10 @@ libdir='$install_libdir'\ ...@@ -3675,8 +3717,10 @@ libdir='$install_libdir'\
done done
if test -z "$run"; then if test -z "$run"; then
# Export the shlibpath_var. if test -n "$shlibpath_var"; then
eval "export $shlibpath_var" # Export the shlibpath_var.
eval "export $shlibpath_var"
fi
# Restore saved enviroment variables # Restore saved enviroment variables
if test "${save_LC_ALL+set}" = set; then if test "${save_LC_ALL+set}" = set; then
...@@ -3693,8 +3737,10 @@ libdir='$install_libdir'\ ...@@ -3693,8 +3737,10 @@ libdir='$install_libdir'\
exit 1 exit 1
else else
# Display what would be done. # Display what would be done.
eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" if test -n "$shlibpath_var"; then
$echo "export $shlibpath_var" eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
$echo "export $shlibpath_var"
fi
$echo "$cmd$args" $echo "$cmd$args"
exit 0 exit 0
fi fi
......
mysql-test/README
View file @ a10bb898
...@@ -22,14 +22,20 @@ You can create your own test cases. To create a test case: ...@@ -22,14 +22,20 @@ You can create your own test cases. To create a test case:
If you are using mysqltest commands (like result file names) in your If you are using mysqltest commands (like result file names) in your
test case you should do create the result file as follows: test case you should do create the result file as follows:
mysql-test-run --record < t/test_case_name.test mysql-test-run --record test_case_name
or
mysqltest --record < t/test_case_name.test
If you only have a simple test cases consistent of SQL commands and comments If you only have a simple test cases consistent of SQL commands and comments
you can create the test case one of the following ways: you can create the test case one of the following ways:
mysql < t/test_case_name.test > r/test_case_name.result mysql-test-run --record test_case_name
mysql test < t/test_case_name.test > r/test_case_name.result
mysql-test-run --record --record-file=r/test_case_name.result < t/test_case_name.test mysqltest --record --record-file=r/test_case_name.result < t/test_case_name.test
When this is done, take a look at r/test_case_name.result When this is done, take a look at r/test_case_name.result
- If the result is wrong, you have found a bug; In this case you should - If the result is wrong, you have found a bug; In this case you should
......
mysql-test/mysql-test-run.sh
View file @ a10bb898
...@@ -135,19 +135,19 @@ MYSQL_TEST="$MYSQL_TEST --no-defaults --socket=$MASTER_MYSOCK --database=$DB --u ...@@ -135,19 +135,19 @@ MYSQL_TEST="$MYSQL_TEST --no-defaults --socket=$MASTER_MYSOCK --database=$DB --u
GDB_MASTER_INIT=/tmp/gdbinit.master GDB_MASTER_INIT=/tmp/gdbinit.master
GDB_SLAVE_INIT=/tmp/gdbinit.slave GDB_SLAVE_INIT=/tmp/gdbinit.slave
if [ "$1" = "-force" ] ; then if [ "$1" = "--force" ] ; then
FORCE=1 FORCE=1
shift 1 shift 1
fi fi
if [ "$1" = "-record" ] ; then if [ "$1" = "--record" ] ; then
RECORD=1 RECORD=1
shift 1 shift 1
fi fi
if [ "$1" = "-gcov" ]; if [ "$1" = "--gcov" ];
then then
if [ x$BINARY_DIST = x1 ] ; then if [ x$BINARY_DIST = x1 ] ; then
echo "Cannot do coverage test without the source - please us source dist" echo "Cannot do coverage test without the source - please us source dist"
...@@ -483,7 +483,7 @@ run_testcase () ...@@ -483,7 +483,7 @@ run_testcase ()
$ECHO $ECHO
$ECHO $ECHO
if [ x$FORCE != x1 ] ; then if [ x$FORCE != x1 ] ; then
echo "Aborting, if you want to continue, re-run with -force" echo "Aborting, if you want to continue, re-run with --force"
mysql_stop mysql_stop
exit 1 exit 1
fi fi
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7