Author: paul
Date: 2009-09-21 21:42:42 +0200 (Mon, 21 Sep 2009)
New Revision: 16727
Log:
r44730@frost: paul | 2009-09-21 14:35:55 -0500
Fix docs bug:
Bug#47351: Document --plugin command line options
Modified:
trunk/dynamic-docs/command-optvars/mysqld.xml
trunk/refman-5.1/dba-mysqld-server-core.xml
trunk/refman-5.4/dba-mysqld-server-core.xml
trunk/refman-6.0.sav/dba-mysqld-server-core.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:26459
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:44727
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:26459
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:44730
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml 2009-09-21 18:34:48 UTC (rev 16726)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml 2009-09-21 19:42:42 UTC (rev 16727)
Changed blocks: 1, Lines Added: 30, Lines Deleted: 0; 1074 bytes
@@ -15298,6 +15298,36 @@
</mysqloption>
+ <mysqloption section="server" id="plugin">
+
+ <xrefto id="option_mysqld_plugin"/>
+
+ <name>plugin-load</name>
+
+<!--
+ Note that dash-dash-plugin is a general option prefix, not an
+ option in itself. This entry just gives us a way to list it.
+-->
+
+ <shortdescription>
+ Prefix for specifying plugin-specific options.
+ </shortdescription>
+
+ <types>
+ <optype class="cmdline" format="--plugin-xxx"/>
+ <optype class="mycnf"/>
+ </types>
+
+ <values vartype="string" platform="all"/>
+
+ <versions>
+ <manual version="5.1"/>
+ <manual version="5.4"/>
+ <manual version="6.0"/>
+ </versions>
+
+ </mysqloption>
+
<mysqloption section="server" id="plugin_dir">
<xrefto id="sysvar_plugin_dir"/>
Modified: trunk/refman-5.1/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.1/dba-mysqld-server-core.xml 2009-09-21 18:34:48 UTC (rev 16726)
+++ trunk/refman-5.1/dba-mysqld-server-core.xml 2009-09-21 19:42:42 UTC (rev 16727)
Changed blocks: 1, Lines Added: 35, Lines Deleted: 0; 1900 bytes
@@ -2139,6 +2139,41 @@
</listitem>
<listitem>
+ <para id="option_mysqld_plugin">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>plugin option prefix</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>plugin option prefix</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option role="mysqld">--plugin-<replaceable>xxx</replaceable></option>
+ </para>
+
+ <para>
+ Specifies an option that pertains to a server plugin. For
+ example, many storage engines can be built as plugins, and for
+ such engines, options for them can be specified with a
+ <option role="mysqld">--plugin</option> prefix. Thus, the
+ <option role="sysvar">--innodb_file_per_table</option> option
+ for <literal>InnoDB</literal> can be specified as
+ <option role="sysvar" condition="innodb_file_per_table">--plugin-innodb_file_per_table</option>.
+ </para>
+
+ <para>
+ For boolean options that can be enabled or disabled, the
+ <option>--skip</option> prefix and other alternative formats
+ are supported as well (see
+ <xref linkend="option-modifiers"/>). For example,
+ <option role="sysvar" condition="innodb_file_per_table">--skip-plugin-innodb_file_per_table</option>
+ disables <option role="sysvar">innodb_file_per_table</option>.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_plugin-load">
<indexterm>
<primary>mysqld</primary>
Modified: trunk/refman-5.4/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-5.4/dba-mysqld-server-core.xml 2009-09-21 18:34:48 UTC (rev 16726)
+++ trunk/refman-5.4/dba-mysqld-server-core.xml 2009-09-21 19:42:42 UTC (rev 16727)
Changed blocks: 1, Lines Added: 35, Lines Deleted: 0; 1900 bytes
@@ -2235,6 +2235,41 @@
</listitem>
<listitem>
+ <para id="option_mysqld_plugin">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>plugin option prefix</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>plugin option prefix</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option role="mysqld">--plugin-<replaceable>xxx</replaceable></option>
+ </para>
+
+ <para>
+ Specifies an option that pertains to a server plugin. For
+ example, many storage engines can be built as plugins, and for
+ such engines, options for them can be specified with a
+ <option role="mysqld">--plugin</option> prefix. Thus, the
+ <option role="sysvar">--innodb_file_per_table</option> option
+ for <literal>InnoDB</literal> can be specified as
+ <option role="sysvar" condition="innodb_file_per_table">--plugin-innodb_file_per_table</option>.
+ </para>
+
+ <para>
+ For boolean options that can be enabled or disabled, the
+ <option>--skip</option> prefix and other alternative formats
+ are supported as well (see
+ <xref linkend="option-modifiers"/>). For example,
+ <option role="sysvar" condition="innodb_file_per_table">--skip-plugin-innodb_file_per_table</option>
+ disables <option role="sysvar">innodb_file_per_table</option>.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_plugin-load">
<indexterm>
<primary>mysqld</primary>
Modified: trunk/refman-6.0.sav/dba-mysqld-server-core.xml
===================================================================
--- trunk/refman-6.0.sav/dba-mysqld-server-core.xml 2009-09-21 18:34:48 UTC (rev 16726)
+++ trunk/refman-6.0.sav/dba-mysqld-server-core.xml 2009-09-21 19:42:42 UTC (rev 16727)
Changed blocks: 1, Lines Added: 35, Lines Deleted: 0; 1912 bytes
@@ -2223,6 +2223,41 @@
</listitem>
<listitem>
+ <para id="option_mysqld_plugin">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>plugin option prefix</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>plugin option prefix</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option role="mysqld">--plugin-<replaceable>xxx</replaceable></option>
+ </para>
+
+ <para>
+ Specifies an option that pertains to a server plugin. For
+ example, many storage engines can be built as plugins, and for
+ such engines, options for them can be specified with a
+ <option role="mysqld">--plugin</option> prefix. Thus, the
+ <option role="sysvar">--innodb_file_per_table</option> option
+ for <literal>InnoDB</literal> can be specified as
+ <option role="sysvar" condition="innodb_file_per_table">--plugin-innodb_file_per_table</option>.
+ </para>
+
+ <para>
+ For boolean options that can be enabled or disabled, the
+ <option>--skip</option> prefix and other alternative formats
+ are supported as well (see
+ <xref linkend="option-modifiers"/>). For example,
+ <option role="sysvar" condition="innodb_file_per_table">--skip-plugin-innodb_file_per_table</option>
+ disables <option role="sysvar">innodb_file_per_table</option>.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="option_mysqld_plugin-load">
<indexterm>
<primary>mysqld</primary>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r16727 - in trunk: . dynamic-docs/command-optvars refman-5.1 refman-5.4 refman-6.0.sav | paul.dubois | 21 Sep |
