mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
726d27ee37
NULL MERGE: this ChangeSet will be null merged into mysql-5.1 Fixes: - Bug #26662: mysqld assertion when creating temporary (InnoDB) table on a tmpfs filesystem Fix by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set this flag immediately after open(2)ing. This way an error caused by O_DIRECT not being supported can easily be ignored. - Bug #23313: AUTO_INCREMENT=# not reported back for InnoDB tables - Bug #21404: AUTO_INCREMENT value reset when Adding FKEY (or ALTER?) Report the current value of the AUTO_INCREMENT counter to MySQL. innobase/configure.in: Apply innodb-5.0-ss1405 snapshot Revision r1396: branches/5.0: Merge r1395 from trunk: * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set this flag immediately after open(2)ing. This way an error caused by O_DIRECT not being supported can easily be ignored. * Add support for skipping the OS caching on Solaris by calling directio() instead of fcntl(). innobase/os/os0file.c: Apply innodb-5.0-ss1405 snapshot Revision r1394: branches/5.0: Merge r1391 from trunk: Merge the bodies of os_file_handle_error() and os_file_handle_error_no_exit() into a generic function which is called from both os_file_handle_error() and os_file_handle_error_no_exit() Revision r1396: branches/5.0: Merge r1395 from trunk: * Fix Bug#26662 by not open(2)ing with O_DIRECT but rather calling fcntl(2) to set this flag immediately after open(2)ing. This way an error caused by O_DIRECT not being supported can easily be ignored. * Add support for skipping the OS caching on Solaris by calling directio() instead of fcntl(). mysql-test/r/innodb.result: Apply innodb-5.0-ss1405 snapshot Revision r1405: branches/5.0: Merge r1404 from trunk: Report the current value of the AUTO_INCREMENT counter to MySQL. (Bug #23313, Bug #21404) ha_innobase::update_create_info(): New function, to report the auto_increment_value. mysql-test/t/innodb.test: Apply innodb-5.0-ss1405 snapshot Revision r1405: branches/5.0: Merge r1404 from trunk: Report the current value of the AUTO_INCREMENT counter to MySQL. (Bug #23313, Bug #21404) ha_innobase::update_create_info(): New function, to report the auto_increment_value. sql/ha_innodb.cc: Apply innodb-5.0-ss1405 snapshot Revision r1405: branches/5.0: Merge r1404 from trunk: Report the current value of the AUTO_INCREMENT counter to MySQL. (Bug #23313, Bug #21404) ha_innobase::update_create_info(): New function, to report the auto_increment_value. sql/ha_innodb.h: Apply innodb-5.0-ss1405 snapshot Revision r1405: branches/5.0: Merge r1404 from trunk: Report the current value of the AUTO_INCREMENT counter to MySQL. (Bug #23313, Bug #21404) ha_innobase::update_create_info(): New function, to report the auto_increment_value.
139 lines
3.6 KiB
Text
139 lines
3.6 KiB
Text
# Process this file with autoconf to produce a configure script
|
|
AC_INIT
|
|
AC_CANONICAL_SYSTEM
|
|
AM_MAINTAINER_MODE
|
|
AM_CONFIG_HEADER(ib_config.h)
|
|
AM_INIT_AUTOMAKE(ib, 0.90)
|
|
|
|
# This is need before AC_PROG_CC
|
|
#
|
|
|
|
if test "x${CFLAGS-}" = x ; then
|
|
cflags_is_set=no
|
|
else
|
|
cflags_is_set=yes
|
|
fi
|
|
|
|
if test "x${CPPFLAGS-}" = x ; then
|
|
cppflags_is_set=no
|
|
else
|
|
cppflags_is_set=yes
|
|
fi
|
|
|
|
if test "x${LDFLAGS-}" = x ; then
|
|
ldflags_is_set=no
|
|
else
|
|
ldflags_is_set=yes
|
|
fi
|
|
|
|
# The following hack should ensure that configure doesn't add optimizing
|
|
# or debugging flags to CFLAGS or CXXFLAGS
|
|
CFLAGS="$CFLAGS "
|
|
CXXFLAGS="$CXXFLAGS "
|
|
|
|
AC_PROG_CC
|
|
AC_PROG_RANLIB
|
|
AC_PROG_INSTALL
|
|
AC_PROG_LIBTOOL
|
|
AC_CHECK_HEADERS(aio.h sched.h)
|
|
AC_CHECK_SIZEOF(int, 4)
|
|
AC_CHECK_SIZEOF(long, 4)
|
|
AC_CHECK_SIZEOF(void*, 4)
|
|
AC_CHECK_FUNCS(sched_yield)
|
|
AC_CHECK_FUNCS(fdatasync)
|
|
AC_CHECK_FUNCS(localtime_r)
|
|
#AC_CHECK_FUNCS(readdir_r) MySQL checks that it has also the right args.
|
|
# Some versions of Unix only take 2 arguments.
|
|
#AC_C_INLINE Already checked in MySQL
|
|
AC_C_BIGENDIAN
|
|
|
|
# Build optimized or debug version ?
|
|
# First check for gcc and g++
|
|
if test "$ac_cv_prog_gcc" = "yes"
|
|
then
|
|
DEBUG_CFLAGS="-g"
|
|
DEBUG_OPTIMIZE_CC="-O"
|
|
OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
|
|
else
|
|
DEBUG_CFLAGS="-g"
|
|
DEBUG_OPTIMIZE_CC=""
|
|
OPTIMIZE_CFLAGS="-O"
|
|
fi
|
|
if test "$ac_cv_prog_cxx_g" = "yes"
|
|
then
|
|
DEBUG_CXXFLAGS="-g"
|
|
DEBUG_OPTIMIZE_CXX="-O"
|
|
OPTIMIZE_CXXFLAGS="-O3"
|
|
else
|
|
DEBUG_CXXFLAGS="-g"
|
|
DEBUG_OPTIMIZE_CXX=""
|
|
OPTIMIZE_CXXFLAGS="-O"
|
|
fi
|
|
AC_ARG_WITH(debug,
|
|
[ --without-debug Build a production version without debugging code],
|
|
[with_debug=$withval],
|
|
[with_debug=no])
|
|
if test "$with_debug" = "yes"
|
|
then
|
|
# Medium debug.
|
|
CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DDBUG_ON -DSAFE_MUTEX $CFLAGS"
|
|
CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
|
|
elif test "$with_debug" = "full"
|
|
then
|
|
# Full debug. Very slow in some cases
|
|
CFLAGS="$DEBUG_CFLAGS -DDBUG_ON -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
|
|
CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
|
|
else
|
|
# Optimized version. No debug
|
|
CFLAGS="$OPTIMIZE_CFLAGS -DDBUG_OFF $CFLAGS -DDEBUG_OFF"
|
|
CXXFLAGS="$OPTIMIZE_CXXFLAGS -DDBUG_OFF $CXXFLAGS -DDEBUG_OFF"
|
|
fi
|
|
|
|
case "$target_os" in
|
|
lin*)
|
|
CFLAGS="$CFLAGS -DUNIV_LINUX";;
|
|
hpux10*)
|
|
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX -DUNIV_HPUX10";;
|
|
hp*)
|
|
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE -DUNIV_HPUX";;
|
|
aix*)
|
|
CFLAGS="$CFLAGS -DUNIV_AIX";;
|
|
irix*)
|
|
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
|
|
osf*)
|
|
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
|
|
*solaris*|*SunOS*)
|
|
CFLAGS="$CFLAGS -DUNIV_SOLARIS";;
|
|
sysv5uw7*)
|
|
# Problem when linking on SCO
|
|
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
|
|
openbsd*)
|
|
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
|
|
esac
|
|
|
|
case "$target" in
|
|
i[[4567]]86-*-*)
|
|
CFLAGS="$CFLAGS -DUNIV_INTEL_X86";;
|
|
# The compiler on Linux/S390 does not seem to have inlining
|
|
s390-*-*)
|
|
CFLAGS="$CFLAGS -DUNIV_MUST_NOT_INLINE";;
|
|
esac
|
|
|
|
# must go in pair with AR as set by MYSQL_CHECK_AR
|
|
if test -z "$ARFLAGS"
|
|
then
|
|
ARFLAGS="cru"
|
|
fi
|
|
AC_SUBST(ARFLAGS)
|
|
|
|
AC_OUTPUT(Makefile os/Makefile ut/Makefile btr/Makefile dnl
|
|
buf/Makefile data/Makefile dnl
|
|
dict/Makefile dyn/Makefile dnl
|
|
eval/Makefile fil/Makefile fsp/Makefile fut/Makefile dnl
|
|
ha/Makefile ibuf/Makefile include/Makefile dnl
|
|
lock/Makefile log/Makefile dnl
|
|
mach/Makefile mem/Makefile mtr/Makefile dnl
|
|
page/Makefile pars/Makefile que/Makefile dnl
|
|
read/Makefile rem/Makefile row/Makefile dnl
|
|
srv/Makefile sync/Makefile thr/Makefile trx/Makefile dnl
|
|
usr/Makefile)
|