Author: paul
Date: 2007-10-15 20:43:07 +0200 (Mon, 15 Oct 2007)
New Revision: 8101
Log:
r31111@polar: paul | 2007-10-15 13:40:11 -0500
Bring current 5.1 mysqlslap options into sync with reality.
Modified:
trunk/dynamic-docs/command-optvars/mysqlslap.xml
trunk/refman-5.1/client-utility-programs.xml
trunk/refman-5.2/client-utility-programs.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:31102
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25621
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:31111
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25621
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/dynamic-docs/command-optvars/mysqlslap.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqlslap.xml 2007-10-15 18:13:23 UTC (rev 8100)
+++ trunk/dynamic-docs/command-optvars/mysqlslap.xml 2007-10-15 18:43:07 UTC (rev 8101)
Changed blocks: 4, Lines Added: 3, Lines Deleted: 14; 1738 bytes
@@ -460,6 +460,7 @@
<versions>
<manual version="5.1"/>
<introduced version="5.1.5"/>
+ <removed version="5.1.18"/>
</versions>
</option>
<option command="mysqlslap" section="server" id="number-char-cols">
@@ -543,20 +544,6 @@
<introduced version="5.1.5"/>
</versions>
</option>
- <option command="mysqlslap" section="server" id="skip-query">
- <xrefto id="option_mysqlslap_skip-query"/>
- <name>skip-query</name>
- <shortdescription lang="en">
- Don't run any SELECT statements
- </shortdescription>
- <types>
- <optype class="cmdline" format="--skip-query"/>
- <optype class="mycnf"/>
- </types>
- <versions>
- <manual version="5.1"/>
- </versions>
- </option>
<option command="mysqlslap" section="replication" id="slave">
<xrefto id="option_mysqlslap_slave"/>
<name>slave</name>
@@ -570,6 +557,7 @@
<versions>
<manual version="5.1"/>
<introduced version="5.1.5"/>
+ <removed version="5.1.18"/>
</versions>
</option>
<option command="mysqlslap" section="server" id="use-threads">
@@ -585,6 +573,7 @@
<versions>
<manual version="5.1"/>
<introduced version="5.1.6"/>
+ <removed version="5.1.18"/>
</versions>
</option>
Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml 2007-10-15 18:13:23 UTC (rev 8100)
+++ trunk/refman-5.1/client-utility-programs.xml 2007-10-15 18:43:07 UTC (rev 8101)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 34; 2503 bytes
@@ -15270,7 +15270,7 @@
<para>
The directory to use for storing locks. This option was
- added in MySQL 5.1.5.
+ added in MySQL 5.1.5 and removed in 5.1.18.
</para>
</listitem>
@@ -15533,26 +15533,6 @@
</listitem>
<listitem>
- <para id="option_mysqlslap_skip-query">
- <indexterm>
- <primary>mysqlslap</primary>
- <secondary>skip-query option</secondary>
- </indexterm>
-
- <indexterm>
- <primary>skip-query option</primary>
- <secondary>mysqlslap</secondary>
- </indexterm>
-
- <option>--skip-query</option>, <option>-Q</option>
- </para>
-
- <para>
- Don't run any <literal>SELECT</literal> statements.
- </para>
- </listitem>
-
- <listitem>
<para id="option_mysqlslap_slave">
<indexterm>
<primary>mysqlslap</primary>
@@ -15571,19 +15551,8 @@
Follow master locks for other <command>mysqlslap</command>
clients. Use this option if you are trying to synchronize
around one master server with
-
- <indexterm>
- <primary>mysqlslap</primary>
- <secondary>lock-directory option</secondary>
- </indexterm>
-
- <indexterm>
- <primary>lock-directory option</primary>
- <secondary>mysqlslap</secondary>
- </indexterm>
-
<option>--lock-directory</option> plus NFS. This option
- was added in MySQL 5.1.5.
+ was added in MySQL 5.1.5 and removed in 5.1.18.
</para>
</listitem>
@@ -15653,7 +15622,8 @@
calls. This option causes <command>pthread</command> calls
to be used instead. On Windows, the default is to use
<literal>pthread</literal> calls and the option has no
- effect. This option was added in MySQL 5.1.6.
+ effect. This option was added in MySQL 5.1.6 and removed
+ in 5.1.18.
</para>
</listitem>
Modified: trunk/refman-5.2/client-utility-programs.xml
===================================================================
--- trunk/refman-5.2/client-utility-programs.xml 2007-10-15 18:13:23 UTC (rev 8100)
+++ trunk/refman-5.2/client-utility-programs.xml 2007-10-15 18:43:07 UTC (rev 8101)
Changed blocks: 4, Lines Added: 4, Lines Deleted: 34; 2503 bytes
@@ -15192,7 +15192,7 @@
<para>
The directory to use for storing locks. This option was
- added in MySQL 5.1.5.
+ added in MySQL 5.1.5 and removed in 5.1.18.
</para>
</listitem>
@@ -15455,26 +15455,6 @@
</listitem>
<listitem>
- <para id="option_mysqlslap_skip-query">
- <indexterm>
- <primary>mysqlslap</primary>
- <secondary>skip-query option</secondary>
- </indexterm>
-
- <indexterm>
- <primary>skip-query option</primary>
- <secondary>mysqlslap</secondary>
- </indexterm>
-
- <option>--skip-query</option>, <option>-Q</option>
- </para>
-
- <para>
- Don't run any <literal>SELECT</literal> statements.
- </para>
- </listitem>
-
- <listitem>
<para id="option_mysqlslap_slave">
<indexterm>
<primary>mysqlslap</primary>
@@ -15493,19 +15473,8 @@
Follow master locks for other <command>mysqlslap</command>
clients. Use this option if you are trying to synchronize
around one master server with
-
- <indexterm>
- <primary>mysqlslap</primary>
- <secondary>lock-directory option</secondary>
- </indexterm>
-
- <indexterm>
- <primary>lock-directory option</primary>
- <secondary>mysqlslap</secondary>
- </indexterm>
-
<option>--lock-directory</option> plus NFS. This option
- was added in MySQL 5.1.5.
+ was added in MySQL 5.1.5 and removed in 5.1.18.
</para>
</listitem>
@@ -15575,7 +15544,8 @@
calls. This option causes <command>pthread</command> calls
to be used instead. On Windows, the default is to use
<literal>pthread</literal> calls and the option has no
- effect. This option was added in MySQL 5.1.6.
+ effect. This option was added in MySQL 5.1.6 and removed
+ in 5.1.18.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8101 - in trunk: . dynamic-docs/command-optvars refman-5.1 refman-5.2 | paul | 15 Oct |
