Author: paul
Date: 2007-04-03 20:27:41 +0200 (Tue, 03 Apr 2007)
New Revision: 5718
Log:
r22830@polar: paul | 2007-04-03 13:21:18 -0500
Add some variable/option information.
(Bug#20414)
Modified:
trunk/dynamic-docs/mysqld-optvar/options.xml
trunk/refman-4.1/dba-core.xml
trunk/refman-4.1/replication.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.0/replication.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-5.1/replication-configuration.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:22736
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18626
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:22830
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:18626
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
Modified: trunk/dynamic-docs/mysqld-optvar/options.xml
===================================================================
--- trunk/dynamic-docs/mysqld-optvar/options.xml 2007-04-03 18:24:24 UTC (rev 5717)
+++ trunk/dynamic-docs/mysqld-optvar/options.xml 2007-04-03 18:27:41 UTC (rev 5718)
Changed blocks: 8, Lines Added: 34, Lines Deleted: 27; 4961 bytes
@@ -5950,6 +5950,7 @@
</option>
<option command="mysqld" section="server" id="max-binlog-dump-events">
<!-- checked -->
+ <xrefto id="optvar_max-binlog-dump-events"/>
<name>max-binlog-dump-events</name>
<shortdescription lang="en">Option used by mysql-test for debugging and
testing of replication</shortdescription>
@@ -6423,6 +6424,7 @@
</versions>
</option>
<option command="mysqld" section="server" id="multi_range_count">
+ <xrefto id="optvar_multi_range_count"/>
<name>multi_range_count</name>
<shortdescription lang="en">The maximum number of ranges to send to a table
handler at once during range selects</shortdescription>
@@ -6441,32 +6443,9 @@
<manual version="5.1"/>
</versions>
</option>
- <option command="mysqld" section="myisam" id="myisam-recover">
- <!-- checked -->
- <xrefto id="optvar_myisam-recover"/>
- <name>myisam-recover</name>
- <shortdescription lang="en">Set the mode for automatic recovery</shortdescription>
- <types>
- <optype class="cmdline" format="--myisam-recover[=name]"
- setvar="myisam-recover"/>
- <optype class="mycnf"/>
- <vartype isdynamic="yes" class="server"/>
- </types>
- <values vartype="enumeration" platform="all">
- <value default="OFF"/>
- <choice value="DEFAULT"/>
- <choice value="BACKUP"/>
- <choice value="FORCE"/>
- <choice value="QUICK"/>
- </values>
- <versions>
- <manual version="4.1"/>
- <manual version="5.0"/>
- <manual version="5.1"/>
- </versions>
- </option>
<option command="mysqld" section="myisam" id="myisam_block_size">
<!-- checked -->
+ <xrefto id="optvar_myisam_block_size"/>
<name>myisam_block_size</name>
<shortdescription lang="en">Block size to be used for MyISAM index pages</shortdescription>
<types>
@@ -6555,6 +6534,30 @@
<manual version="5.1"/>
</versions>
</option>
+ <option command="mysqld" section="myisam" id="myisam-recover">
+ <!-- checked -->
+ <xrefto id="optvar_myisam-recover"/>
+ <name>myisam-recover</name>
+ <shortdescription lang="en">Set the mode for automatic recovery</shortdescription>
+ <types>
+ <optype class="cmdline" format="--myisam-recover[=name]"
+ setvar="myisam-recover"/>
+ <optype class="mycnf"/>
+ <vartype isdynamic="yes" class="server"/>
+ </types>
+ <values vartype="enumeration" platform="all">
+ <value default="OFF"/>
+ <choice value="DEFAULT"/>
+ <choice value="BACKUP"/>
+ <choice value="FORCE"/>
+ <choice value="QUICK"/>
+ </values>
+ <versions>
+ <manual version="4.1"/>
+ <manual version="5.0"/>
+ <manual version="5.1"/>
+ </versions>
+ </option>
<option command="mysqld" section="myisam" id="myisam_repair_threads">
<!-- checked -->
<xrefto id="optvar_myisam_repair_threads"/>
@@ -7817,8 +7820,9 @@
</option>
<option command="mysqld" section="server" id="report-password">
<!-- checked -->
+ <xrefto id="optvar_report-password"/>
<name>report-password</name>
- <shortdescription lang="en">Undocumented</shortdescription>
+ <shortdescription lang="en">The account password that a slave server should report to the master server</shortdescription>
<types>
<optype class="cmdline" format="--report-password=name"
setvar="report-password"/>
@@ -7854,8 +7858,9 @@
</option>
<option command="mysqld" section="server" id="report-user">
<!-- checked -->
+ <xrefto id="optvar_report-user"/>
<name>report-user</name>
- <shortdescription lang="en">Undocumented. --rpl-recovery-rank=# Undocumented</shortdescription>
+ <shortdescription lang="en">The account name that a slave server should report to the master server</shortdescription>
<types>
<optype class="cmdline" format="--report-user=name" setvar="report-user"/>
<optype class="mycnf"/>
@@ -8021,8 +8026,9 @@
</option>
<option command="mysqld" section="server" id="show-slave-auth-info">
<!-- checked -->
+ <xrefto id="optvar_show-slave-auth-info"/>
<name>show-slave-auth-info</name>
- <shortdescription lang="en">Show user and password in SHOW SLAVE HOSTS on
+ <shortdescription lang="en">Show username and password in SHOW SLAVE HOSTS on
this master</shortdescription>
<types>
<optype class="cmdline" format="--show-slave-auth-info"
@@ -9405,6 +9411,7 @@
</option>
<option command="mysqld" section="server" id="timed_mutexes">
<!-- checked -->
+ <xrefto id="optvar_timed_mutexes"/>
<name>timed_mutexes</name>
<shortdescription lang="en">Specify whether to time mutexes (only InnoDB
mutexes are currently supported)</shortdescription>
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2007-04-03 18:24:24 UTC (rev 5717)
+++ trunk/refman-4.1/dba-core.xml 2007-04-03 18:27:41 UTC (rev 5718)
Changed blocks: 3, Lines Added: 53, Lines Deleted: 0; 2519 bytes
@@ -1799,7 +1799,28 @@
</listitem>
<listitem>
+ <para id="optvar_max-binlog-dump-events">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>max-binlog-dump-events option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>max-binlog-dump-events option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--max-binlog-dump-events</option>
+ </para>
+
<para>
+ This option is used internally by the MySQL test suite for
+ replication testing and debugging.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="optvar_memlock">
<indexterm>
<primary>mysqld</primary>
<secondary>memlock option</secondary>
@@ -2654,7 +2675,28 @@
</listitem>
<listitem>
+ <para id="optvar_sporadic-binlog-dump-fail">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>sporadic-binlog-dump-fail option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>sporadic-binlog-dump-fail option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--sporadic-binlog-dump-fail</option>
+ </para>
+
<para>
+ This option is used internally by the MySQL test suite for
+ replication testing and debugging.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<indexterm>
<primary>mysqld</primary>
<secondary>SSL options</secondary>
@@ -5170,7 +5212,18 @@
</listitem>
<listitem>
+ <para id="optvar_myisam_block_size">
+ <literal>myisam_block_size</literal>
+ </para>
+
<para>
+ The block size to be used for <literal>MyISAM</literal>
+ index pages.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="optvar_myisam_data_pointer_size">
<literal>myisam_data_pointer_size</literal>
</para>
Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml 2007-04-03 18:24:24 UTC (rev 5717)
+++ trunk/refman-4.1/replication.xml 2007-04-03 18:27:41 UTC (rev 5718)
Changed blocks: 3, Lines Added: 70, Lines Deleted: 1; 3181 bytes
@@ -3493,7 +3493,7 @@
</listitem>
<listitem>
- <para>
+ <para id="optvar_report-host">
<indexterm>
<primary>mysqld</primary>
<secondary>report-host option</secondary>
@@ -3530,7 +3530,30 @@
</listitem>
<listitem>
+ <para id="optvar_report-password">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>report-password option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>report-password option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--report-password=<replaceable>password</replaceable></option>
+ </para>
+
<para>
+ The account password of the slave to be reported to the master
+ during slave registration. This value appears in the output of
+ <literal>SHOW SLAVE HOSTS</literal> on the master server if
+ the <option>--show-slave-auth-info</option> option is given.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="optvar_report-port">
<indexterm>
<primary>mysqld</primary>
<secondary>report-port option</secondary>
@@ -3563,9 +3586,55 @@
</listitem>
<listitem>
+ <para id="optvar_report-user">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>report-user option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>report-user option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--report-user=<replaceable>user_name</replaceable></option>
+ </para>
+
<para>
+ The account username of the slave to be reported to the master
+ during slave registration. This value appears in the output of
+ <literal>SHOW SLAVE HOSTS</literal> on the master server if
+ the <option>--show-slave-auth-info</option> option is given.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="optvar_show-slave-auth-info">
<indexterm>
<primary>mysqld</primary>
+ <secondary>show-slave-auth-info option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>show-slave-auth-info option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--show-slave-auth-info</option>
+ </para>
+
+ <para>
+ Display slave usernames and passwords in the output of
+ <literal>SHOW SLAVE HOSTS</literal> on the master server for
+ slaves started with the <option>--report-user</option> and
+ <option>--report-password</option> options.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>mysqld</primary>
<secondary>skip-slave-start option</secondary>
</indexterm>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2007-04-03 18:24:24 UTC (rev 5717)
+++ trunk/refman-5.0/dba-core.xml 2007-04-03 18:27:41 UTC (rev 5718)
Changed blocks: 3, Lines Added: 53, Lines Deleted: 0; 2464 bytes
@@ -1947,6 +1947,27 @@
</listitem>
<listitem>
+ <para id="optvar_max-binlog-dump-events">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>max-binlog-dump-events option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>max-binlog-dump-events option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--max-binlog-dump-events</option>
+ </para>
+
+ <para>
+ This option is used internally by the MySQL test suite for
+ replication testing and debugging.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="optvar_memlock">
<indexterm>
<primary>mysqld</primary>
@@ -2671,7 +2692,28 @@
</listitem>
<listitem>
+ <para id="optvar_sporadic-binlog-dump-fail">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>sporadic-binlog-dump-fail option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>sporadic-binlog-dump-fail option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--sporadic-binlog-dump-fail</option>
+ </para>
+
<para>
+ This option is used internally by the MySQL test suite for
+ replication testing and debugging.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<indexterm>
<primary>mysqld</primary>
<secondary>SSL options</secondary>
@@ -5656,6 +5698,17 @@
</listitem>
<listitem>
+ <para id="optvar_myisam_block_size">
+ <literal>myisam_block_size</literal>
+ </para>
+
+ <para>
+ The block size to be used for <literal>MyISAM</literal>
+ index pages.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="optvar_myisam_data_pointer_size">
<literal>myisam_data_pointer_size</literal>
</para>
Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml 2007-04-03 18:24:24 UTC (rev 5717)
+++ trunk/refman-5.0/replication.xml 2007-04-03 18:27:41 UTC (rev 5718)
Changed blocks: 2, Lines Added: 69, Lines Deleted: 0; 2973 bytes
@@ -3515,6 +3515,29 @@
</listitem>
<listitem>
+ <para id="optvar_report-password">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>report-password option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>report-password option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--report-password=<replaceable>password</replaceable></option>
+ </para>
+
+ <para>
+ The account password of the slave to be reported to the master
+ during slave registration. This value appears in the output of
+ <literal>SHOW SLAVE HOSTS</literal> on the master server if
+ the <option>--show-slave-auth-info</option> option is given.
+ </para>
+ </listitem>
+
+ <listitem>
<remark role="note">
Currently, this option is of no real interest; it is meant for
failover replication, which is not yet implemented.
@@ -3544,6 +3567,52 @@
</listitem>
<listitem>
+ <para id="optvar_report-user">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>report-user option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>report-user option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--report-user=<replaceable>user_name</replaceable></option>
+ </para>
+
+ <para>
+ The account username of the slave to be reported to the master
+ during slave registration. This value appears in the output of
+ <literal>SHOW SLAVE HOSTS</literal> on the master server if
+ the <option>--show-slave-auth-info</option> option is given.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="optvar_show-slave-auth-info">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>show-slave-auth-info option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>show-slave-auth-info option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--show-slave-auth-info</option>
+ </para>
+
+ <para>
+ Display slave usernames and passwords in the output of
+ <literal>SHOW SLAVE HOSTS</literal> on the master server for
+ slaves started with the <option>--report-user</option> and
+ <option>--report-password</option> options.
+ </para>
+ </listitem>
+
+ <listitem>
<remark role="note">
Currently, this option is of no real interest; it is meant for
failover replication, which is not yet implemented.
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2007-04-03 18:24:24 UTC (rev 5717)
+++ trunk/refman-5.1/dba-core.xml 2007-04-03 18:27:41 UTC (rev 5718)
Changed blocks: 3, Lines Added: 53, Lines Deleted: 0; 2464 bytes
@@ -2038,6 +2038,27 @@
</listitem>
<listitem>
+ <para id="optvar_max-binlog-dump-events">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>max-binlog-dump-events option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>max-binlog-dump-events option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--max-binlog-dump-events</option>
+ </para>
+
+ <para>
+ This option is used internally by the MySQL test suite for
+ replication testing and debugging.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="optvar_memlock">
<indexterm>
<primary>mysqld</primary>
@@ -2710,7 +2731,28 @@
</listitem>
<listitem>
+ <para id="optvar_sporadic-binlog-dump-fail">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>sporadic-binlog-dump-fail option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>sporadic-binlog-dump-fail option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--sporadic-binlog-dump-fail</option>
+ </para>
+
<para>
+ This option is used internally by the MySQL test suite for
+ replication testing and debugging.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
<indexterm>
<primary>mysqld</primary>
<secondary>SSL options</secondary>
@@ -5753,6 +5795,17 @@
</listitem>
<listitem>
+ <para id="optvar_myisam_block_size">
+ <literal>myisam_block_size</literal>
+ </para>
+
+ <para>
+ The block size to be used for <literal>MyISAM</literal>
+ index pages.
+ </para>
+ </listitem>
+
+ <listitem>
<para id="optvar_myisam_data_pointer_size">
<literal>myisam_data_pointer_size</literal>
</para>
Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml 2007-04-03 18:24:24 UTC (rev 5717)
+++ trunk/refman-5.1/replication-configuration.xml 2007-04-03 18:27:41 UTC (rev 5718)
Changed blocks: 1, Lines Added: 69, Lines Deleted: 0; 2793 bytes
@@ -3197,6 +3197,75 @@
</listitem>
<listitem>
+ <para id="optvar_report-password">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>report-password option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>report-password option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--report-password=<replaceable>password</replaceable></option>
+ </para>
+
+ <para>
+ The account password of the slave to be reported to the master
+ during slave registration. This value appears in the output of
+ <literal>SHOW SLAVE HOSTS</literal> on the master server if
+ the <option>--show-slave-auth-info</option> option is given.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="optvar_report-user">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>report-user option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>report-user option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--report-user=<replaceable>user_name</replaceable></option>
+ </para>
+
+ <para>
+ The account username of the slave to be reported to the master
+ during slave registration. This value appears in the output of
+ <literal>SHOW SLAVE HOSTS</literal> on the master server if
+ the <option>--show-slave-auth-info</option> option is given.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para id="optvar_show-slave-auth-info">
+ <indexterm>
+ <primary>mysqld</primary>
+ <secondary>show-slave-auth-info option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>show-slave-auth-info option</primary>
+ <secondary>mysqld</secondary>
+ </indexterm>
+
+ <option>--show-slave-auth-info</option>
+ </para>
+
+ <para>
+ Display slave usernames and passwords in the output of
+ <literal>SHOW SLAVE HOSTS</literal> on the master server for
+ slaves started with the <option>--report-user</option> and
+ <option>--report-password</option> options.
+ </para>
+ </listitem>
+
+ <listitem>
<remark role="note">
Currently, this option is of no real interest; it is meant for
failover replication, which is not yet implemented.
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r5718 - in trunk: . dynamic-docs/mysqld-optvar refman-4.1 refman-5.0 refman-5.1 | paul | 3 Apr |
