diff --git a/Docs/manual.texi b/Docs/manual.texi index 1de38a43aa696f69f135396c0d18ec3fee78bcd7..9729033b56b26df31ea24724ebc7bc57f706c8e2 100644 --- a/Docs/manual.texi +++ b/Docs/manual.texi @@ -990,7 +990,6 @@ Changes in release 4.0.x (Development; Alpha) Changes in release 3.23.x (Stable) -* News-3.23.39a:: * News-3.23.39:: Changes in release 3.23.39 * News-3.23.38:: Changes in release 3.23.38 * News-3.23.37:: Changes in release 3.23.37 @@ -46310,7 +46309,6 @@ users use this code as the rest of the code and because of this we are not yet 100% confident in this code. @menu -* News-3.23.39a:: * News-3.23.39:: Changes in release 3.23.39 * News-3.23.38:: Changes in release 3.23.38 * News-3.23.37:: Changes in release 3.23.37 @@ -46354,14 +46352,7 @@ not yet 100% confident in this code. * News-3.23.0:: Changes in release 3.23.0 @end menu -@node News-3.23.39a, News-3.23.39, News-3.23.x, News-3.23.x -@appendixsubsec Changes in release 3.23.39a -@itemize @bullet -@item -Fixed a small bug in the mysql-test benchmark suite -@end itemize - -@node News-3.23.39, News-3.23.38, News-3.23.39a, News-3.23.x +@node News-3.23.39, News-3.23.38, News-3.23.x, News-3.23.x @appendixsubsec Changes in release 3.23.39 @itemize @bullet @item diff --git a/configure.in b/configure.in index 1b95a5d580083da5700ca1b37ca1d9b5976fc2d2..37bc22ff63ecee0df71847fab9a1b42e95d40437 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 3.23.39a) +AM_INIT_AUTOMAKE(mysql, 3.23.39) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 diff --git a/innobase/include/univ.i b/innobase/include/univ.i index d29ca83b0fc398426bddfcaf8787509450fbab3f..4c67f49d19957e8c513a54d46a69a874a3a0b6df 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -49,6 +49,8 @@ subdirectory of 'mysql'. */ /* Include the header file generated by GNU autoconf */ #include "../ib_config.h" +#undef UNIV_INTEL_X86 /* Temporary fix for gcc 2.96 */ + #ifdef HAVE_SCHED_H #include <sched.h> #endif