bk commit - mysqldoc tree (paul:1.2802)

[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.2802 05/04/02 12:11:16 paul@stripped +1 -0
  Merge paul@stripped:/home/bk/mysqldoc
  into frost.snake.net:/Volumes/frost2/MySQL/bk/mysqldoc

  Docs/manual.texi
    1.2635 05/04/02 12:11:13 paul@stripped +0 -0
    Auto merged

# 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:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc/RESYNC

--- 1.2634/Docs/manual.texi	2005-04-01 17:09:36 -06:00
+++ 1.2635/Docs/manual.texi	2005-04-02 12:11:13 -06:00
@@ -17993,6 +17993,46 @@
 that you use. Programs that do not understand the option quit after
 displaying an error message if you try to run them.
 
+Beginning with MySQL 4.1.11 in the 4.1 series and MySQL 5.0.4 in the 5.0 series,
+it is possible to use @code{!include} directives in option files to include
+specific files and @code{!includedir} to search specific directories for option
+files. For example, to include the file @file{/home/mydir/myopt.cnf}, you can
+use the following:
+
+@example
+!include /home/me/myopt.cnf
+@end example
+
+To search the directory @file{/home/mydir} for all files ending in @file{.cnf}
+and to read these as option files, you would use:
+
+@example
+!includedir /home/mydir
+@end example
+
+Note that these options are section-specific. For example, suppose that you were
+to use something in @file{my.cnf} such as the following:
+
+@example
+[mysqld]
+!include /home/mydir/myopt.cnf
+@end example
+
+In such a case, the file @file{myopt.cnf} would be processed only for the server,
+and the @code{!include} directive would be ignored by any client applications.
+However, if you were to use the following:
+
+@example
+[mysqldump]
+!includedir /home/mydir/my-dump-options
+@end example
+
+then the directory @file{/home/mydir/my-dump-options} would be checked for
+option files ending in @file{.cnf} by @command{mysqldump} only, and not by the
+server or by any other client applications. @strong{Note}: Currently, any files
+to be found and included using the @code{!includedir} directive
+@strong{must} have filenames ending in @file{.cnf}.
+
 As of MySQL 4.0.14, if you want to create option groups that should be
 read only by one specific @command{mysqld} server release series, you can do this by
 using groups with names of @code{[mysqld-4.0]}, @code{[mysqld-4.1]}, and so
@@ -97968,6 +98008,11 @@
 (Previously it was necessary to pass @code{-DBIG_TABLES} to the compiler
 manually in order to enable large table support.) See @ref{configure options}
 for details.
+@item
+New configuration directives @code{!include} and @code{!includedir} implemented
+for including option files and searching directories for option files. See
+@ref{Option files} for usage.
+
 @end itemize
 
 Bugs fixed:
@@ -99380,6 +99425,10 @@
 (Previously it was necessary to pass @code{-DBIG_TABLES} to the compiler
 manually in order to enable large table support.) See @ref{configure options}
 for details.
+@item
+Added configuration directives @code{!include} and @code{!includedir} for
+including option files and searching directories for option files. See
+@ref{Option files} for usage.
 @end itemize
 
 Bugs fixed: