Merge work:/home/bk/mysql into hundin.mysql.fi:/my/bk/mysql (72537f31) · Commits · Software / OSDI20 Artifacts / mariadb

Docs/manual.texi

+1 −10

Original line number	Diff line number	Diff line
		@@ -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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+2 −0

Original line number	Diff line number	Diff line
		@@ -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