mirror of
https://github.com/MariaDB/server.git
synced 2025-01-24 07:44:22 +01:00
619c11cbe2
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. mysql-test/r/innodb.result: Applied innodb-5.1-ss1404 snapshot Revision r1404: 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: Applied innodb-5.1-ss1404 snapshot Revision r1404: 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. storage/innobase/handler/ha_innodb.cc: Applied innodb-5.1-ss1404 snapshot Revision r1404: 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. storage/innobase/handler/ha_innodb.h: Applied innodb-5.1-ss1404 snapshot Revision r1404: 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. storage/innobase/os/os0file.c: Applied innodb-5.1-ss1404 snapshot Revision r1395: * 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(). Approved by: Heikki Revision r1391: 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() Approved by: Marko storage/innobase/plug.in: Applied innodb-5.1-ss1404 snapshot Revision r1395: * 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(). Approved by: Heikki
74 lines
2.5 KiB
Text
74 lines
2.5 KiB
Text
MYSQL_STORAGE_ENGINE(innobase, innodb, [InnoDB Storage Engine],
|
|
[Transactional Tables using InnoDB], [max,max-no-ndb])
|
|
MYSQL_PLUGIN_DIRECTORY(innobase, [storage/innobase])
|
|
MYSQL_PLUGIN_STATIC(innobase, [libinnobase.a])
|
|
MYSQL_PLUGIN_ACTIONS(innobase, [
|
|
AC_CHECK_LIB(rt, aio_read, [innodb_system_libs="-lrt"])
|
|
AC_SUBST(innodb_system_libs)
|
|
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_C_BIGENDIAN
|
|
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
|
|
AC_CONFIG_FILES(
|
|
storage/innobase/ut/Makefile
|
|
storage/innobase/btr/Makefile
|
|
storage/innobase/buf/Makefile
|
|
storage/innobase/data/Makefile
|
|
storage/innobase/dict/Makefile
|
|
storage/innobase/dyn/Makefile
|
|
storage/innobase/eval/Makefile
|
|
storage/innobase/fil/Makefile
|
|
storage/innobase/fsp/Makefile
|
|
storage/innobase/fut/Makefile
|
|
storage/innobase/ha/Makefile
|
|
storage/innobase/ibuf/Makefile
|
|
storage/innobase/lock/Makefile
|
|
storage/innobase/log/Makefile
|
|
storage/innobase/mach/Makefile
|
|
storage/innobase/mem/Makefile
|
|
storage/innobase/mtr/Makefile
|
|
storage/innobase/os/Makefile
|
|
storage/innobase/page/Makefile
|
|
storage/innobase/pars/Makefile
|
|
storage/innobase/que/Makefile
|
|
storage/innobase/read/Makefile
|
|
storage/innobase/rem/Makefile
|
|
storage/innobase/row/Makefile
|
|
storage/innobase/srv/Makefile
|
|
storage/innobase/sync/Makefile
|
|
storage/innobase/thr/Makefile
|
|
storage/innobase/trx/Makefile
|
|
storage/innobase/handler/Makefile
|
|
storage/innobase/usr/Makefile)
|
|
])
|
|
MYSQL_PLUGIN_DEPENDS_ON_MYSQL_INTERNALS(innobase, [handler/ha_innodb.cc])
|
|
|