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

[paul]

Author: paul
Date: 2006-04-05 21:26:55 +0200 (Wed, 05 Apr 2006)
New Revision: 1734

Log:
 r4312@kite-hub:  paul | 2006-04-05 13:49:22 -0500
 Add information about format of files that mysqlslap reads. (Bug#18013)


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


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

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-04-05 14:48:47 UTC (rev 1733)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-04-05 19:26:55 UTC (rev 1734)
@@ -12653,10 +12653,6 @@
           available as of MySQL 5.1.4.
         </para>
 
-        <remark role="todo">
-          Add rest of description here.
-        </remark>
-
         <para>
           Invoke <command>mysqlslap</command> like this:
         </para>
@@ -12666,6 +12662,20 @@
 </programlisting>
 
         <para>
+          Some options such as <option>--create</option> or
+          <option>--query</option> enable you to specify a string
+          containing an SQL statement or a file containing statements.
+          If you specify a file, by default it must contain one
+          statement per line. (That is, the implicit statement delimiter
+          is the newline character.) Use the
+          <option>--delimiter</option> to specify different delimiter,
+          which allows you to specify statements that span multiple
+          lines or place multiple statements on a single line. You
+          cannot include comments in a file;
+          <command>mysqlslap</command> does not understand them.
+        </para>
+
+        <para>
           <command>mysqlslap</command> supports the following options:
         </para>