diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-06-12 22:02:51 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-06-12 22:02:51 +0300 |
| commit | 235a7ffd109422e515767cf32de2201163a0c5df (patch) | |
| tree | 9c39feec94306f695f8249dc61bfb10656a9c435 | |
| parent | 61ffb8e9ba7e8fd541e406137f255f6f9cac358e (diff) | |
| parent | 573b6a6d731cf08d9866b6646063f2553687105f (diff) | |
| download | mariadb-git-235a7ffd109422e515767cf32de2201163a0c5df.tar.gz | |
Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql
innobase/include/univ.i:
Auto merged
| -rw-r--r-- | Docs/manual.texi | 11 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | innobase/include/univ.i | 2 |
3 files changed, 4 insertions, 11 deletions
diff --git a/Docs/manual.texi b/Docs/manual.texi index 1de38a43aa6..9729033b56b 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 1b95a5d5800..37bc22ff63e 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 9ded084d044..a47c3ae77c9 100644 --- a/innobase/include/univ.i +++ b/innobase/include/univ.i @@ -51,6 +51,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 |