bk commit - mysqldoc tree (paul:1.2870)

[paul]

Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2870 05/04/15 14:31:49 paul@stripped +1 -0
  manual.texi:
    --defaults-extra-file read after all other option files, on Windows.

  Docs/manual.texi
    1.2702 05/04/15 14:31:16 paul@stripped +10 -8
    --defaults-extra-file read after all other option files, on Windows.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	kite-hub.kitebird.com
# Root:	/src/extern/MySQL/bk/mysqldoc

--- 1.2701/Docs/manual.texi	2005-04-15 08:15:05 -05:00
+++ 1.2702/Docs/manual.texi	2005-04-15 14:31:16 -05:00
@@ -17893,6 +17893,7 @@
 @item @code{@var{WINDIR}\my.ini} @tab Global options
 @item @code{C:\my.cnf} @tab Global options
 @item @code{@var{INSTALLDIR}\my.ini} @tab Global Options
+@item @code{defaults-extra-file} @tab The file specified with
@code{--defaults-extra-file=@var{path}}, if any
 @end multitable
 
 @var{WINDIR} represents the location of your Windows directory.  This is
@@ -17919,14 +17920,15 @@
 @item @code{~/.my.cnf} @tab User-specific options
 @end multitable
 
-@var{MYSQL_HOME} is an environment variable containing the path to the directory
-in which the server-specific @code{my.cnf} file resides. This used to be @var{DATADIR}
-prior to MySQL version 5.0.3.
-
-If @var{MYSQL_HOME} is not set and there is a @code{my.cnf} file in @var{DATADIR} and
-there is no @code{my.cnf} file in @var{BASEDIR}, @code{mysqld_safe} sets @var{MYSQL_HOME}
to @var{DATADIR}.
-Otherwise, if @var{MYSQL_HOME} is not set and there is no @code{my.cnf} in @var{DATADIR},
then
-@code{mysqld_safe} sets @var{MYSQL_HOME} to @var{BASEDIR}.
+@var{MYSQL_HOME} is an environment variable containing the path to the
+directory in which the server-specific @code{my.cnf} file resides. This
+used to be @var{DATADIR} prior to MySQL version 5.0.3.
+
+If @var{MYSQL_HOME} is not set and there is a @code{my.cnf} file in
+@var{DATADIR} and there is no @code{my.cnf} file in @var{BASEDIR},
+@code{mysqld_safe} sets @var{MYSQL_HOME} to @var{DATADIR}.  Otherwise, if
+@var{MYSQL_HOME} is not set and there is no @code{my.cnf} in @var{DATADIR},
+then @code{mysqld_safe} sets @var{MYSQL_HOME} to @var{BASEDIR}.
 
 Typically this is @file{/usr/local/mysql/data} for a binary installation or
 @file{/usr/local/var} for a source installation.  Note that this is the data