Merge work:/home/bk/mysql into donna.mysql.com:/home/my/bk/mysql (f046a115) · Commits · Software / OSDI20 Artifacts / mariadb

BitKeeper/etc/logging_ok

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,3 +4,4 @@ monty@narttu.mysql.fi
		mwagner@work.mysql.com
		sasha@mysql.sashanet.com
		serg@serg.mysql.com
		yfaktoro@nslinuxw2.bedford.progress.com

+10 −10

Original line number	Diff line number	Diff line
		@@ -148,8 +148,7 @@ version see the relevant distribution.
		* Function Index:: SQL command, type and function index
		* Concept Index:: Concept Index

		@detailmenu
		--- The Detailed Node Listing ---
		@detailmenu --- The Detailed Node Listing ---

		General Information About MySQL

		@@ -9039,7 +9038,7 @@ The @code{mysql.server} script uses the following variables:
		@findex command-line options
		@cindex options, command-line
		@node Command-line options, Option files, Automatic start, Post-installation
		@subsection mysqld command-line options
		@subsection Command-line Options

		@code{mysqld} accepts the following command-line options:

		@@ -20013,7 +20012,8 @@ DELAYED}. If the queue becomes full, any client that does @code{INSERT
		DELAYED} will wait until there is room in the queue again.

		@item @code{flush}
		This is @code{ON} if you started @code{mysqld} with @code{--flush}.
		This is @code{ON} if you have started @strong{MySQL} with the @code{--flush}
		option.

		@item @code{flush_time}
		If this is set to a non-zero value, then every @code{flush_time} seconds all