Author: paul
Date: 2006-12-07 18:51:12 +0100 (Thu, 07 Dec 2006)
New Revision: 4156
Log:
r16860@polar: paul | 2006-12-07 11:49:22 -0600
Add section/manpage for my_print_defaults.
Modified:
trunk/proto-doc/proto-manpage.xml
trunk/refman-4.1/client-utility-programs.xml
trunk/refman-4.1/database-administration.xml
trunk/refman-5.0/client-utility-programs.xml
trunk/refman-5.0/database-administration.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.1/database-administration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:16846
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13271
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:12611
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:16860
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13271
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:12611
Modified: trunk/proto-doc/proto-manpage.xml
===================================================================
--- trunk/proto-doc/proto-manpage.xml 2006-12-07 16:20:37 UTC (rev 4155)
+++ trunk/proto-doc/proto-manpage.xml 2006-12-07 17:51:12 UTC (rev 4156)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 650 bytes
@@ -16,9 +16,12 @@
<refentry id="PROGNAME">
<!-- initial index terms go here -->
+ <indexterm>
+ <primary>PROGNAME</primary>
+ </indexterm>
<refmeta>
- <refentrytitle>PROGNAME</refentrytitle>
+ <refentrytitle><command>PROGNAME</command></refentrytitle>
<manvolnum>VOLNUM</manvolnum>
<refmiscinfo class="manual">MySQL Database System</refmiscinfo>
Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml 2006-12-07 16:20:37 UTC (rev 4155)
+++ trunk/refman-4.1/client-utility-programs.xml 2006-12-07 17:51:12 UTC (rev 4156)
Changed blocks: 2, Lines Added: 285, Lines Deleted: 0; 9417 bytes
@@ -69,6 +69,21 @@
<listitem>
<para>
<indexterm>
+ <primary>my_print_defaults</primary>
+ </indexterm>
+
+ <command>my_print_defaults</command>
+ </para>
+
+ <para>
+ A utility that are present in option groups of option files.
+ See <xref linkend="my-print-defaults"/>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary>myisam_ftdump</primary>
</indexterm>
@@ -455,6 +470,276 @@
</section>
+ <section id="fake-id-for-my-print-defaults-manpage-section-wrapper">
+
+ <title>fake title for my_print_defaults manpage section wrapper</title>
+
+ <refentry id="my-print-defaults">
+
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ </indexterm>
+
+ <refmeta>
+
<refentrytitle><command>my_print_defaults</command></refentrytitle>
+
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
+ <refmiscinfo class="source">MySQL</refmiscinfo>
+ <refmiscinfo class="version">¤t-series;</refmiscinfo>
+ <refmiscinfo class="refman">Display Options from Option
Files</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>my_print_defaults</refname>
+
+ <refpurpose>display options from option files</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>my_print_defaults
[<replaceable>options</replaceable>]
<replaceable>option_group</replaceable> ...</command>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsection id="my-print-defaults-description">
+
+ <title>Description</title>
+
+ <para>
+ <command>my_print_defaults</command> displays the options that
+ are present in option groups of option files. The output
+ indicates what options will be used by programs that read the
+ specified option groups. For example, the
+ <command>mysqlcheck</command> program reads the
+ <literal>[mysqlcheck]</literal> and
+ <literal>[client]</literal> option groups. To see what options
+ are present in those groups in the standard option files,
+ invoke <command>my_print_defaults</command> like this:
+ </para>
+
+<programlisting>
+shell> <userinput>my_print_defaults mysqlcheck client</userinput>
+--user=myusername
+--password=secret
+--host=localhost
+</programlisting>
+
+ <para>
+ The output consists of options, one per line, in the form that
+ they would be specified on the command line.
+ </para>
+
+ <para>
+ <literal>my_print_defaults</literal> understands the following
+ options:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>help option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>help option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--help</option>, <option>-?</option>
+ </para>
+
+ <para>
+ Display a help message and exit.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>config-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>config-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--config-file=<replaceable>file_name</replaceable></option>,
+
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>defaults-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>defaults-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--defaults-file=<replaceable>file_name</replaceable></option>,
+ <option>-c
<replaceable>file_name</replaceable></option>
+ </para>
+
+ <para>
+ Read only the given option file.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>debug option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>debug option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--debug=<replaceable>debug_options</replaceable>,
+ -# <replaceable>debug_options</replaceable></option>
+ </para>
+
+ <para>
+ Write a debugging log. The
+ <replaceable>debug_options</replaceable> string often is
+
<literal>'d:t:o,<replaceable>file_name</replaceable>'</literal>.
+ The default is
+ <literal>'d:t:o,/tmp/my_print_defaults.trace'</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>defaults-extra-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>defaults-extra-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--defaults-extra-file=<replaceable>file_name</replaceable></option>,
+
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>extra-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>extra-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--extra-file=<replaceable>file_name</replaceable></option>,
+ <option>-e
<replaceable>file_name</replaceable></option>
+ </para>
+
+ <para>
+ Read this option file after the global option file but (on
+ Unix) before the user option file.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>defaults-group-suffix option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>defaults-group-suffix option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--defaults-group-suffix=<replaceable>suffix</replaceable></option>,
+ <option>-g
<replaceable>suffix</replaceable></option>
+ </para>
+
+ <para>
+ In addition to the groups named on the command line, read
+ groups that have the given suffix.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>no-defaults option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>no-defaults option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--no-defaults</option>, <option>-n</option>
+ </para>
+
+ <para>
+ Return an empty string.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>verbose option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>verbose option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--verbose</option>, <option>-v</option>
+ </para>
+
+ <para>
+ Verbose mode. Print more information about what the
+ program does.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>version option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>version option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--version</option>, <option>-V</option>
+ </para>
+
+ <para>
+ Display version information and exit.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ </refsection>
+
+ </refentry>
+
+ </section>
+
<section id="fake-id-for-myisam-ftdump-manpage-section-wrapper">
<title>fake title for myisam_ftdump manpage section wrapper</title>
Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml 2006-12-07 16:20:37 UTC (rev 4155)
+++ trunk/refman-4.1/database-administration.xml 2006-12-07 17:51:12 UTC (rev 4156)
Changed blocks: 3, Lines Added: 24, Lines Deleted: 6; 2159 bytes
@@ -216,6 +216,24 @@
</para>
</listitem>
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>mysql_tzinfo_to_sql</primary>
+ </indexterm>
+
+ <command>mysql_tzinfo_to_sql</command>
+ </para>
+
+ <para>
+ This program loads the time zone tables in the
+ <literal>mysql</literal> database using the contents of the
+ host system <firstterm>zoneinfo</firstterm> database (the set
+ of files describing time zones). SQL. See
+ <xref linkend="mysql-tzinfo-to-sql"/>.
+ </para>
+ </listitem>
+
</itemizedlist>
<para>
@@ -2211,11 +2229,11 @@
external locking disabled, you must shut down the server
to use <command>myisamchk</command> or
<command>isamchk</command>. See
- <xref linkend="system-optimization"/>. As of MySQL 3.23, you can use
- the <literal>CHECK TABLE</literal> and <literal>REPAIR
- TABLE</literal> statements to check and repair
- <literal>MyISAM</literal> tables. This option previously
- was named <option>--skip-locking</option>.
+ <xref linkend="system-optimization"/>. As of MySQL 3.23,
+ you can use the <literal>CHECK TABLE</literal> and
+ <literal>REPAIR TABLE</literal> statements to check and
+ repair <literal>MyISAM</literal> tables. This option
+ previously was named <option>--skip-locking</option>.
</para>
<para>
@@ -11638,7 +11656,7 @@
</indexterm>
<refmeta>
- <refentrytitle>mysql_tzinfo_to_sql</refentrytitle>
+
<refentrytitle><command>mysql_tzinfo_to_sql</command></refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="manual">MySQL Database System</refmiscinfo>
Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml 2006-12-07 16:20:37 UTC (rev 4155)
+++ trunk/refman-5.0/client-utility-programs.xml 2006-12-07 17:51:12 UTC (rev 4156)
Changed blocks: 2, Lines Added: 285, Lines Deleted: 0; 9417 bytes
@@ -69,6 +69,21 @@
<listitem>
<para>
<indexterm>
+ <primary>my_print_defaults</primary>
+ </indexterm>
+
+ <command>my_print_defaults</command>
+ </para>
+
+ <para>
+ A utility that are present in option groups of option files.
+ See <xref linkend="my-print-defaults"/>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary>myisam_ftdump</primary>
</indexterm>
@@ -441,6 +456,276 @@
</section>
+ <section id="fake-id-for-my-print-defaults-manpage-section-wrapper">
+
+ <title>fake title for my_print_defaults manpage section wrapper</title>
+
+ <refentry id="my-print-defaults">
+
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ </indexterm>
+
+ <refmeta>
+
<refentrytitle><command>my_print_defaults</command></refentrytitle>
+
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
+ <refmiscinfo class="source">MySQL</refmiscinfo>
+ <refmiscinfo class="version">¤t-series;</refmiscinfo>
+ <refmiscinfo class="refman">Display Options from Option
Files</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>my_print_defaults</refname>
+
+ <refpurpose>display options from option files</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>my_print_defaults
[<replaceable>options</replaceable>]
<replaceable>option_group</replaceable> ...</command>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsection id="my-print-defaults-description">
+
+ <title>Description</title>
+
+ <para>
+ <command>my_print_defaults</command> displays the options that
+ are present in option groups of option files. The output
+ indicates what options will be used by programs that read the
+ specified option groups. For example, the
+ <command>mysqlcheck</command> program reads the
+ <literal>[mysqlcheck]</literal> and
+ <literal>[client]</literal> option groups. To see what options
+ are present in those groups in the standard option files,
+ invoke <command>my_print_defaults</command> like this:
+ </para>
+
+<programlisting>
+shell> <userinput>my_print_defaults mysqlcheck client</userinput>
+--user=myusername
+--password=secret
+--host=localhost
+</programlisting>
+
+ <para>
+ The output consists of options, one per line, in the form that
+ they would be specified on the command line.
+ </para>
+
+ <para>
+ <literal>my_print_defaults</literal> understands the following
+ options:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>help option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>help option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--help</option>, <option>-?</option>
+ </para>
+
+ <para>
+ Display a help message and exit.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>config-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>config-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--config-file=<replaceable>file_name</replaceable></option>,
+
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>defaults-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>defaults-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--defaults-file=<replaceable>file_name</replaceable></option>,
+ <option>-c
<replaceable>file_name</replaceable></option>
+ </para>
+
+ <para>
+ Read only the given option file.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>debug option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>debug option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--debug=<replaceable>debug_options</replaceable>,
+ -# <replaceable>debug_options</replaceable></option>
+ </para>
+
+ <para>
+ Write a debugging log. The
+ <replaceable>debug_options</replaceable> string often is
+
<literal>'d:t:o,<replaceable>file_name</replaceable>'</literal>.
+ The default is
+ <literal>'d:t:o,/tmp/my_print_defaults.trace'</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>defaults-extra-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>defaults-extra-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--defaults-extra-file=<replaceable>file_name</replaceable></option>,
+
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>extra-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>extra-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--extra-file=<replaceable>file_name</replaceable></option>,
+ <option>-e
<replaceable>file_name</replaceable></option>
+ </para>
+
+ <para>
+ Read this option file after the global option file but (on
+ Unix) before the user option file.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>defaults-group-suffix option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>defaults-group-suffix option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--defaults-group-suffix=<replaceable>suffix</replaceable></option>,
+ <option>-g
<replaceable>suffix</replaceable></option>
+ </para>
+
+ <para>
+ In addition to the groups named on the command line, read
+ groups that have the given suffix.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>no-defaults option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>no-defaults option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--no-defaults</option>, <option>-n</option>
+ </para>
+
+ <para>
+ Return an empty string.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>verbose option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>verbose option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--verbose</option>, <option>-v</option>
+ </para>
+
+ <para>
+ Verbose mode. Print more information about what the
+ program does.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>version option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>version option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--version</option>, <option>-V</option>
+ </para>
+
+ <para>
+ Display version information and exit.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ </refsection>
+
+ </refentry>
+
+ </section>
+
<section id="fake-id-for-myisam-ftdump-manpage-section-wrapper">
<title>fake title for myisam_ftdump manpage section wrapper</title>
Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml 2006-12-07 16:20:37 UTC (rev 4155)
+++ trunk/refman-5.0/database-administration.xml 2006-12-07 17:51:12 UTC (rev 4156)
Changed blocks: 4, Lines Added: 28, Lines Deleted: 10; 2772 bytes
@@ -208,6 +208,22 @@
<listitem>
<para>
<indexterm>
+ <primary><command>mysqlmanager</command></primary>
+ </indexterm>
+
+ <command>mysqlmanager</command>
+ </para>
+
+ <para>
+ The MySQL Instance Manager, a program for monitoring and
+ managing MySQL servers. See
+ <xref linkend="instance-manager"/>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary>mysql_fix_privilege_tables</primary>
</indexterm>
@@ -248,16 +264,18 @@
<listitem>
<para>
<indexterm>
- <primary><command>mysqlmanager</command></primary>
+ <primary>mysql_tzinfo_to_sql</primary>
</indexterm>
- <command>mysqlmanager</command>
+ <command>mysql_tzinfo_to_sql</command>
</para>
<para>
- The MySQL Instance Manager, a program for monitoring and
- managing MySQL servers. See
- <xref linkend="instance-manager"/>.
+ This program loads the time zone tables in the
+ <literal>mysql</literal> database using the contents of the
+ host system <firstterm>zoneinfo</firstterm> database (the set
+ of files describing time zones). SQL. See
+ <xref linkend="mysql-tzinfo-to-sql"/>.
</para>
</listitem>
@@ -2323,10 +2341,10 @@
Do not use external locking (system locking). With
external locking disabled, you must shut down the server
to use <command>myisamchk</command>. (See
- <xref linkend="system-optimization"/>.) To avoid this requirement,
- use the <literal>CHECK TABLE</literal> and
<literal>REPAIR
- TABLE</literal> statements to check and repair
- <literal>MyISAM</literal> tables.
+ <xref linkend="system-optimization"/>.) To avoid this
+ requirement, use the <literal>CHECK TABLE</literal> and
+ <literal>REPAIR TABLE</literal> statements to check and
+ repair <literal>MyISAM</literal> tables.
</para>
<para>
@@ -15049,7 +15067,7 @@
</indexterm>
<refmeta>
- <refentrytitle>mysql_tzinfo_to_sql</refentrytitle>
+
<refentrytitle><command>mysql_tzinfo_to_sql</command></refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="manual">MySQL Database System</refmiscinfo>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2006-12-07 16:20:37 UTC (rev 4155)
+++ trunk/refman-5.1/client-utility-programs.xml 2006-12-07 17:51:12 UTC (rev 4156)
Changed blocks: 3, Lines Added: 287, Lines Deleted: 2; 9836 bytes
@@ -69,6 +69,21 @@
<listitem>
<para>
<indexterm>
+ <primary>my_print_defaults</primary>
+ </indexterm>
+
+ <command>my_print_defaults</command>
+ </para>
+
+ <para>
+ A utility that are present in option groups of option files.
+ See <xref linkend="my-print-defaults"/>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary>myisam_ftdump</primary>
</indexterm>
@@ -441,6 +456,276 @@
</section>
+ <section id="fake-id-for-my-print-defaults-manpage-section-wrapper">
+
+ <title>fake title for my_print_defaults manpage section wrapper</title>
+
+ <refentry id="my-print-defaults">
+
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ </indexterm>
+
+ <refmeta>
+
<refentrytitle><command>my_print_defaults</command></refentrytitle>
+
+ <manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
+ <refmiscinfo class="source">MySQL</refmiscinfo>
+ <refmiscinfo class="version">¤t-series;</refmiscinfo>
+ <refmiscinfo class="refman">Display Options from Option
Files</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+ <refname>my_print_defaults</refname>
+
+ <refpurpose>display options from option files</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+ <cmdsynopsis>
+ <command>my_print_defaults
[<replaceable>options</replaceable>]
<replaceable>option_group</replaceable> ...</command>
+ </cmdsynopsis>
+ </refsynopsisdiv>
+
+ <refsection id="my-print-defaults-description">
+
+ <title>Description</title>
+
+ <para>
+ <command>my_print_defaults</command> displays the options that
+ are present in option groups of option files. The output
+ indicates what options will be used by programs that read the
+ specified option groups. For example, the
+ <command>mysqlcheck</command> program reads the
+ <literal>[mysqlcheck]</literal> and
+ <literal>[client]</literal> option groups. To see what options
+ are present in those groups in the standard option files,
+ invoke <command>my_print_defaults</command> like this:
+ </para>
+
+<programlisting>
+shell> <userinput>my_print_defaults mysqlcheck client</userinput>
+--user=myusername
+--password=secret
+--host=localhost
+</programlisting>
+
+ <para>
+ The output consists of options, one per line, in the form that
+ they would be specified on the command line.
+ </para>
+
+ <para>
+ <literal>my_print_defaults</literal> understands the following
+ options:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>help option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>help option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--help</option>, <option>-?</option>
+ </para>
+
+ <para>
+ Display a help message and exit.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>config-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>config-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--config-file=<replaceable>file_name</replaceable></option>,
+
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>defaults-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>defaults-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--defaults-file=<replaceable>file_name</replaceable></option>,
+ <option>-c
<replaceable>file_name</replaceable></option>
+ </para>
+
+ <para>
+ Read only the given option file.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>debug option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>debug option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--debug=<replaceable>debug_options</replaceable>,
+ -# <replaceable>debug_options</replaceable></option>
+ </para>
+
+ <para>
+ Write a debugging log. The
+ <replaceable>debug_options</replaceable> string often is
+
<literal>'d:t:o,<replaceable>file_name</replaceable>'</literal>.
+ The default is
+ <literal>'d:t:o,/tmp/my_print_defaults.trace'</literal>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>defaults-extra-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>defaults-extra-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--defaults-extra-file=<replaceable>file_name</replaceable></option>,
+
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>extra-file option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>extra-file option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--extra-file=<replaceable>file_name</replaceable></option>,
+ <option>-e
<replaceable>file_name</replaceable></option>
+ </para>
+
+ <para>
+ Read this option file after the global option file but (on
+ Unix) before the user option file.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>defaults-group-suffix option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>defaults-group-suffix option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+
<option>--defaults-group-suffix=<replaceable>suffix</replaceable></option>,
+ <option>-g
<replaceable>suffix</replaceable></option>
+ </para>
+
+ <para>
+ In addition to the groups named on the command line, read
+ groups that have the given suffix.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>no-defaults option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>no-defaults option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--no-defaults</option>, <option>-n</option>
+ </para>
+
+ <para>
+ Return an empty string.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>verbose option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>verbose option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--verbose</option>, <option>-v</option>
+ </para>
+
+ <para>
+ Verbose mode. Print more information about what the
+ program does.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>my_print_defaults</primary>
+ <secondary>version option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>version option</primary>
+ <secondary>my_print_defaults</secondary>
+ </indexterm>
+
+ <option>--version</option>, <option>-V</option>
+ </para>
+
+ <para>
+ Display version information and exit.
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ </refsection>
+
+ </refentry>
+
+ </section>
+
<section id="fake-id-for-myisam-ftdump-manpage-section-wrapper">
<title>fake title for myisam_ftdump manpage section wrapper</title>
@@ -6322,10 +6607,10 @@
Tell the server to write debug information to the error
log.
</para>
-
+
<para>
Beginning with MySQL 5.1.12, this includes information
- about the Event Scheduler. See
+ about the Event Scheduler. See
<xref linkend="events-status-info"/>.
</para>
</listitem>
Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml 2006-12-07 16:20:37 UTC (rev 4155)
+++ trunk/refman-5.1/database-administration.xml 2006-12-07 17:51:12 UTC (rev 4156)
Changed blocks: 4, Lines Added: 28, Lines Deleted: 10; 2772 bytes
@@ -191,6 +191,22 @@
<listitem>
<para>
<indexterm>
+ <primary><command>mysqlmanager</command></primary>
+ </indexterm>
+
+ <command>mysqlmanager</command>
+ </para>
+
+ <para>
+ The MySQL Instance Manager, a program for monitoring and
+ managing MySQL servers. See
+ <xref linkend="instance-manager"/>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
<primary>mysql_fix_privilege_tables</primary>
</indexterm>
@@ -231,16 +247,18 @@
<listitem>
<para>
<indexterm>
- <primary><command>mysqlmanager</command></primary>
+ <primary>mysql_tzinfo_to_sql</primary>
</indexterm>
- <command>mysqlmanager</command>
+ <command>mysql_tzinfo_to_sql</command>
</para>
<para>
- The MySQL Instance Manager, a program for monitoring and
- managing MySQL servers. See
- <xref linkend="instance-manager"/>.
+ This program loads the time zone tables in the
+ <literal>mysql</literal> database using the contents of the
+ host system <firstterm>zoneinfo</firstterm> database (the set
+ of files describing time zones). SQL. See
+ <xref linkend="mysql-tzinfo-to-sql"/>.
</para>
</listitem>
@@ -2389,10 +2407,10 @@
Do not use external locking (system locking). With
external locking disabled, you must shut down the server
to use <command>myisamchk</command>. (See
- <xref linkend="system-optimization"/>.) To avoid this requirement,
- use the <literal>CHECK TABLE</literal> and
<literal>REPAIR
- TABLE</literal> statements to check and repair
- <literal>MyISAM</literal> tables.
+ <xref linkend="system-optimization"/>.) To avoid this
+ requirement, use the <literal>CHECK TABLE</literal> and
+ <literal>REPAIR TABLE</literal> statements to check and
+ repair <literal>MyISAM</literal> tables.
</para>
<para>
@@ -15469,7 +15487,7 @@
</indexterm>
<refmeta>
- <refentrytitle>mysql_tzinfo_to_sql</refentrytitle>
+
<refentrytitle><command>mysql_tzinfo_to_sql</command></refentrytitle>
<manvolnum>1</manvolnum>
<refmiscinfo class="manual">MySQL Database System</refmiscinfo>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4156 - in trunk: . proto-doc refman-4.1 refman-5.0 refman-5.1 | paul | 7 Dec |