Author: bmunch
Date: 2010-09-28 12:31:33 +0200 (Tue, 28 Sep 2010)
New Revision: 22869
Log:
Updates for 5.1.51
Modified:
trunk/mysqltest-2.0/command-reference.xml
trunk/mysqltest-2.0/components.xml
trunk/mysqltest-2.0/programs.xml
trunk/mysqltest-2.0/writing-tests.xml
Modified: trunk/mysqltest-2.0/command-reference.xml
===================================================================
--- trunk/mysqltest-2.0/command-reference.xml 2010-09-28 10:12:42 UTC (rev 22868)
+++ trunk/mysqltest-2.0/command-reference.xml 2010-09-28 10:31:33 UTC (rev 22869)
Changed blocks: 3, Lines Added: 13, Lines Deleted: 3; 1684 bytes
@@ -929,8 +929,7 @@
<para>
Disable or enable automatic reconnect for dropped connections.
(The default depends on the client library version.) This
- command only applies to connections made later, not to
- currently open connections.
+ command only applies to the current connection.
</para>
<programlisting>
@@ -1358,7 +1357,9 @@
Terminate the test case. This is considered a <quote>normal
termination.</quote> That is, using <literal>exit</literal>
does not result in evaluation of the test case as having
- failed.
+ failed. It is not necessary to use <literal>exit</literal> at
+ the end of a test case, as the test case will terminate
+ normally when reaching the end without failure.
</para>
</listitem>
@@ -2913,6 +2914,15 @@
</para>
<para>
+ If the expression is a string that does not begin with a numeric
+ digit (possibly preceeded by a plus or minus sign), it evaluates
+ as true if non-empty. Any white space is ignored in this case, so
+ a string consisting of only white space is false. Note that before
+ MySQL 5.1.51, any non-numeric string evaluated as false, but this
+ was not documented.
+ </para>
+
+ <para>
There is no provision for <literal>else</literal> with
<literal>if</literal>.
</para>
Modified: trunk/mysqltest-2.0/components.xml
===================================================================
--- trunk/mysqltest-2.0/components.xml 2010-09-28 10:12:42 UTC (rev 22868)
+++ trunk/mysqltest-2.0/components.xml 2010-09-28 10:31:33 UTC (rev 22869)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 2; 1187 bytes
@@ -135,8 +135,8 @@
<listitem>
<para>
The <filename>t</filename> directory contains test case input
- files. A test case file might also have option files associated
- with it.
+ files. A test case file might also have additional files
+ associated with it.
</para>
<itemizedlist>
@@ -181,6 +181,15 @@
<listitem>
<para>
A file name of the form
+ <filename><replaceable>test_name</replaceable>.cnf</filename>
+ contains additional entries for the config file to be used
+ for this test.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ A file name of the form
<filename><replaceable>test_name</replaceable>-master.sh</filename>
is a shell script that will be executed before the server is
started for the named test case. There may also be a
Modified: trunk/mysqltest-2.0/programs.xml
===================================================================
--- trunk/mysqltest-2.0/programs.xml 2010-09-28 10:12:42 UTC (rev 22868)
+++ trunk/mysqltest-2.0/programs.xml 2010-09-28 10:31:33 UTC (rev 22869)
Changed blocks: 5, Lines Added: 96, Lines Deleted: 2; 4492 bytes
@@ -600,6 +600,33 @@
<para>
<indexterm>
<primary>mysqltest</primary>
+ <secondary>protocol option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>protocol option</primary>
+ <secondary>mysqltest</secondary>
+ </indexterm>
+
+ <option>--protocol=<literal>{TCP|SOCKET|PIPE|MEMORY}</literal></option>
+ </para>
+
+ <para>
+ Choose the protocol for communication with the server.
+ <literal>SOCKET</literal> is default.
+ </para>
+
+ <para>
+ The <option>--protocol</option> option is available from
+ MySQL 5.1.51. It is ignored if running with the embedded
+ server.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>mysqltest</primary>
<secondary>ps-protocol option</secondary>
</indexterm>
@@ -2410,6 +2437,12 @@
option, see
<filename>mysql-test/collections/default.experimental</filename>.
</para>
+
+ <para>
+ From MySQL 5.1.51, it's possible to supply more than one
+ <option>--experimental</option>, test cases listed in all
+ the files will be treated as experimental.
+ </para>
</listitem>
<listitem>
@@ -3466,11 +3499,11 @@
<para>
<indexterm>
<primary>mysql-test-run.pl</primary>
- <secondary>start-and-exit option</secondary>
+ <secondary>start option</secondary>
</indexterm>
<indexterm>
- <primary>start-and-exit option</primary>
+ <primary>start option</primary>
<secondary>mysql-test-run.pl</secondary>
</indexterm>
@@ -3509,6 +3542,36 @@
<para>
<indexterm>
<primary>mysql-test-run.pl</primary>
+ <secondary>start-and-exit option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>start-and-exit option</primary>
+ <secondary>mysql-test-run.pl</secondary>
+ </indexterm>
+
+ <option>--start-and-exit</option>
+ </para>
+
+ <para>
+ This is similar to <option>--start</option>, but
+ <command>mysql-test-run.pl</command> terminates once the
+ server has been started, leaving just the server process
+ running.
+ </para>
+
+ <para>
+ Tha <option>--start-and-exit</option> was available with
+ version 1 of <command>mysql-test-run.pl</command> (unlike
+ <option>--start</option> which came with version 2), and is
+ again supported in version 2 from MySQL 5.1.51.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>mysql-test-run.pl</primary>
<secondary>start-dirty option</secondary>
</indexterm>
@@ -3747,6 +3810,37 @@
<para>
<indexterm>
<primary>mysql-test-run.pl</primary>
+ <secondary>user-args option</secondary>
+ </indexterm>
+
+ <indexterm>
+ <primary>user-args option</primary>
+ <secondary>mysql-test-run.pl</secondary>
+ </indexterm>
+
+ <option>--user-args</option>
+ </para>
+
+ <para>
+ Drops all non-essential command line arguments to the
+ <command>mysqld</command> server, except those supplied with
+ <option>--mysqld</option> arguemnts, if any. Only works in
+ combination with <option>--start</option>,
+ <option>--start-and-exit</option> or
+ <option>--start-dirty</option>, and only if no test name is
+ given.
+ </para>
+
+ <para>
+ The <option>--user-args</option> option was added in MySQL
+ 5.1.51.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <indexterm>
+ <primary>mysql-test-run.pl</primary>
<secondary>valgrind option</secondary>
</indexterm>
Modified: trunk/mysqltest-2.0/writing-tests.xml
===================================================================
--- trunk/mysqltest-2.0/writing-tests.xml 2010-09-28 10:12:42 UTC (rev 22868)
+++ trunk/mysqltest-2.0/writing-tests.xml 2010-09-28 10:31:33 UTC (rev 22869)
Changed blocks: 3, Lines Added: 13, Lines Deleted: 3; 1512 bytes
@@ -1279,8 +1279,9 @@
<para>
The <option>--mysqld</option> option tells
<command>mysql-test-run.pl</command> to start the
- <command>mysqld</command> server with the named options. The
- following command causes <option>--skip-innodb</option> and
+ <command>mysqld</command> server with the named option added.
+ More than one such extra option may be provided. The following
+ command causes <option>--skip-innodb</option> and
<option>--key_buffer_size=16384</option> to be passed to
<command>mysqld</command>:
</para>
@@ -2172,6 +2173,15 @@
replication tests.
</para>
+ <para>
+ From MySQL 5.1.51, it's also possible to provide additional
+ command line options to the restarted server, by writing a line
+ with <literal>restart:</literal> (with a colon) followed by one or
+ more options into the expect file. These extra options will be
+ dropped if the same server is restarted again, unless they are
+ repeated.
+ </para>
+
</section>
<section id="writing-tests-other-tips">
@@ -2191,7 +2201,7 @@
</para>
<programlisting>
-let $1= 1000;
+let $1= 10;
while ($1)
{
# execute your statements here
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r22869 - trunk/mysqltest-2.0 | bjorn.munch | 28 Sep |
