svn commit - mysqldoc@docsrva: r852 - in trunk: . refman-5.1 refman-common

[paul]

Author: paul
Date: 2006-01-16 16:11:36 +0100 (Mon, 16 Jan 2006)
New Revision: 852

Log:
 r6249@frost:  paul | 2006-01-16 09:10:24 -0600
 Update mysqlslap options.
 Plugin changelog entry.


Modified:
   trunk/
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-common/news-5.1.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6240
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2175
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6249
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2175

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-16 09:54:14 UTC (rev 851)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-16 15:11:36 UTC (rev 852)
@@ -230,6 +230,22 @@
       <listitem>
         <para>
           <indexterm>
+            <primary><command>mysqlslap</command></primary>
+          </indexterm>
+
+          <command>mysqlslap</command>
+        </para>
+
+        <para>
+          A client that > is designed to emulate client load for a MySQL
+          server and report the timing of each stage. It works as if
+          multiple clients are accessing the server.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
+          <indexterm>
             <primary><command>mysql_zap</command></primary>
           </indexterm>
 
@@ -7976,16 +7992,6 @@
 
           <listitem>
             <para>
-              <option>--concurrency-load</option>,
<option>-l</option>
-            </para>
-
-            <para>
-              The number of clients to simulate when loading data.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
              
<option>--create=<replaceable>value</replaceable></option>
             </para>
 
@@ -7996,14 +8002,12 @@
 
           <listitem>
             <para>
-             
<option>--data=<replaceable>value</replaceable></option>,
-              <option>-d
<replaceable>value</replaceable></option>
+             
<option>--create-schema=<replaceable>value</replaceable></option>
             </para>
 
             <para>
-              The file or string containing the
-              <literal>INSERT</literal> statement to use for populating
-              the table.
+              The schema in which to run the tests. This option was
+              added in MySQL 5.1.5.
             </para>
           </listitem>
 
@@ -8035,18 +8039,6 @@
 
           <listitem>
             <para>
-              <option>--drop-schema</option>, <option>-D</option>
-            </para>
-
-            <para>
-              Drop the schema if it exists prior to creating, loading,
-              and selecting from the table, and drop the schema
-              afterward.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
              
<option>--engine=<replaceable>engine_name</replaceable></option>,
               <option>-e
<replaceable>engine_name</replaceable></option>
             </para>
@@ -8080,6 +8072,17 @@
 
           <listitem>
             <para>
+             
<option>--lock-directory=<replaceable>path</replaceable></option>
+            </para>
+
+            <para>
+              The directory to use for storing locks. This option was
+              added in MySQL 5.1.5.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
              
<option>--number-char-cols=<replaceable>num</replaceable></option>,
               <option>-x <replaceable>num</replaceable></option>
             </para>
@@ -8104,17 +8107,29 @@
 
           <listitem>
             <para>
-             
<option>--number-rows=<replaceable>num</replaceable></option>,
-              <option>-n <replaceable>num</replaceable></option>
+             
<option>--number-of-query=<replaceable>num</replaceable></option>
             </para>
 
             <para>
-              The number of rows to insert when loading data.
+              Limit each client to approximately this number of queries.
+              This option was added in MySQL 5.1.5.
             </para>
           </listitem>
 
           <listitem>
             <para>
+              <option>--only-print</option>
+            </para>
+
+            <para>
+              Do not connect to databases. <command>mysqlslap</command>
+              only prints what it would have done. This option was added
+              in MySQL 5.1.5.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
              
<option>--password[=<replaceable>password</replaceable>]</option>,
              
<option>-p[<replaceable>password</replaceable>]</option>
             </para>
@@ -8159,6 +8174,17 @@
 
           <listitem>
             <para>
+              <option>--preserve-schema</option>
+            </para>
+
+            <para>
+              Preserve the schema from the <command>mysqlslap</command>
+              run. This option was added in MySQL 5.1.5.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
              
<option>--query=<replaceable>value</replaceable></option>,
               <option>-q
<replaceable>value</replaceable></option>
             </para>
@@ -8182,44 +8208,50 @@
 
           <listitem>
             <para>
-              <option>--skip-create-schema</option>,
<option>-A</option>
+              <option>--skip-query</option>, <option>-Q</option>
             </para>
 
             <para>
-              Don't create a schema. Use an existing schema.
+              Don't run any <literal>SELECT</literal> statements.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <option>--skip-data-load</option>,
<option>-L</option>
+              <option>--slave</option>
             </para>
 
             <para>
-              Don't load any data. Use an existing dataset.
+              Follow master locks for other <command>mysqlslap</command>
+              clients. Use this option if you are trying to synchronize
+              around onem master server with
+              <option>--lock-directory</option> plus NFS. This option
+              was added in MySQL 5.1.5.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <option>--skip-query</option>, <option>-Q</option>
+             
<option>--socket=<replaceable>path</replaceable></option>,
+              <option>-S <replaceable>path</replaceable></option>
             </para>
 
             <para>
-              Don't run any <literal>SELECT</literal> statements.
+              For connections to <literal>localhost</literal>, the Unix
+              socket file to use, or, on Windows, the name of the named
+              pipe to use.
             </para>
           </listitem>
 
           <listitem>
             <para>
-             
<option>--socket=<replaceable>path</replaceable></option>,
-              <option>-S <replaceable>path</replaceable></option>
+              <option>--use-threads</option>
             </para>
 
             <para>
-              For connections to <literal>localhost</literal>, the Unix
-              socket file to use, or, on Windows, the name of the named
-              pipe to use.
+              Use <command>pthread</command> calls rather than
+              <command>fork()</command> calls. This option is the
+              default on Windows. This option was added in MySQL 5.1.5.
             </para>
           </listitem>
 

Modified: trunk/refman-common/news-5.1.xml
===================================================================
--- trunk/refman-common/news-5.1.xml	2006-01-16 09:54:14 UTC (rev 851)
+++ trunk/refman-common/news-5.1.xml	2006-01-16 15:11:36 UTC (rev 852)
@@ -102,6 +102,13 @@
 
       <listitem>
         <para>
+          Plugins now can have status variables that are displayed in
+          the output from <literal>SHOW STATUS</literal>.
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           Added the XML functions <literal>ExtractValue()</literal> and
           <literal>UpdateXML()</literal>.
           <literal>ExtractValue()</literal> returns the content of a