Author: paul
Date: 2008-08-26 20:23:30 +0200 (Tue, 26 Aug 2008)
New Revision: 11608
Log:
r33517@frost: paul | 2008-08-26 12:31:45 -0500
Clarify format of --combination/--mysqld/--mysqltest option value
Modified:
trunk/mysqltest/programs.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33516
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32819
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33517
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32819
Modified: trunk/mysqltest/programs.xml
===================================================================
--- trunk/mysqltest/programs.xml 2008-08-26 18:23:24 UTC (rev 11607)
+++ trunk/mysqltest/programs.xml 2008-08-26 18:23:30 UTC (rev 11608)
Changed blocks: 3, Lines Added: 21, Lines Deleted: 11; 3180 bytes
@@ -1913,18 +1913,24 @@
<secondary>mysql-test-run.pl</secondary>
</indexterm>
- <option>--combination=<replaceable>str</replaceable></option>
+ <option>--combination=<replaceable>value</replaceable></option>
</para>
<para>
- Extra options to pass to <command>mysqld</command>. This
- option is similar to <option>--mysqld</option> but should be
- given two or more times.
- <command>mysql-test-run.pl</command> executes multiple test
- runs, using the options for each instance of
+ Extra options to pass to <command>mysqld</command>. The
+ value should consist of one or more comma-separated
+ <command>mysqld</command> options. This option is similar to
+ <option>--mysqld</option> but should be given two or more
+ times. <command>mysql-test-run.pl</command> executes
+ multiple test runs, using the options for each instance of
<option>--combination</option> in successive runs. If
<option>--combination</option> is given only once, it has no
- effect. See <xref linkend="writing-tests-server-options"/>.
+ effect. For test runs specific to a given test suite, an
+ alternative to the use of <option>--combination</option> is
+ to create a <filename>combinations</filename> file in the
+ suite directory. The file should contain a section of
+ options for each test run. See
+ <xref linkend="writing-tests-server-options"/>.
</para>
<para>
@@ -2476,11 +2482,13 @@
<secondary>mysql-test-run.pl</secondary>
</indexterm>
- <option>--mysqld=<replaceable>str</replaceable></option>
+ <option>--mysqld=<replaceable>value</replaceable></option>
</para>
<para>
- Extra options to pass to <command>mysqld</command>. See
+ Extra options to pass to <command>mysqld</command>. The
+ value should consist of one or more comma-separated
+ <command>mysqld</command> options. See
<xref linkend="writing-tests-server-options"/>.
</para>
</listitem>
@@ -2497,11 +2505,13 @@
<secondary>mysql-test-run.pl</secondary>
</indexterm>
- <option>--mysqltest=<replaceable>str</replaceable></option>
+ <option>--mysqltest=<replaceable>value</replaceable></option>
</para>
<para>
- Extra options to pass to <command>mysqltest</command>. See
+ Extra options to pass to <command>mysqltest</command>. The
+ value should consist of one or more comma-separated
+ <command>mysqltest</command> options. See
<xref linkend="writing-tests-server-options"/>. This option
was added in MySQL 6.0.6.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11608 - in trunk: . mysqltest | paul.dubois | 26 Aug |
