Author: paul
Date: 2006-03-08 05:28:31 +0100 (Wed, 08 Mar 2006)
New Revision: 1524
Log:
r8443@frost: paul | 2006-03-07 22:28:12 -0600
mysqltest material.
Modified:
trunk/
trunk/mysqltest/mysqltest.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8433
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3759
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8443
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3759
Modified: trunk/mysqltest/mysqltest.xml
===================================================================
--- trunk/mysqltest/mysqltest.xml 2006-03-07 22:09:52 UTC (rev 1523)
+++ trunk/mysqltest/mysqltest.xml 2006-03-08 04:28:31 UTC (rev 1524)
@@ -4181,13 +4181,22 @@
enabled by default. With this setting enabled,
<command>mysqltest</command> aborts the test when a
statement sent to the server results in an unexpected error
- [Q: or succeeds when it shouldn't?], [Q: and does not
- generate the <filename>.reject</filename> file?]
+ [Q: and does not generate the <filename>.reject</filename>
+ file?]
</para>
<para>
- [Wiki has some why-this-is-useful notes]
+ [Q: I would have expected
+ <literal>disable_abort_on_error</literal> also to suppress
+ aborts for a statement that succeeds when it shouldn't, or a
+ statement that fails with an error different from that
+ specified as expected.. But <command>mysqltest</command>
+ aborts regardless.]
</para>
+
+ <para>
+ [Wiki has some why-this-is-useful notes for these options]
+ </para>
</listitem>
<listitem>
@@ -4202,8 +4211,8 @@
setting enabled, <command>mysqltest</command> displays the
affected-rows count and the output from the
<literal>mysql_info()</literal> C API function. The
- <quote>affected-rows</quote> value is <literal>rows
- selected</literal> for queries such as
+ <quote>affected-rows</quote> value is <quote>rows
+ selected</quote> for queries such as
<literal>SELECT</literal> and <quote>rows modified</quote>
for statements that change data.
</para>
@@ -4221,8 +4230,8 @@
<command>mysqltest</command> adds query metadata to the
result. This information consists of the values
corresponding to the members of the
- <literal>MYSQL_FIELD</literal> data structure, for each
- column of the result.
+ <literal>MYSQL_FIELD</literal> C API data structure, for
+ each column of the result.
</para>
</listitem>
@@ -4301,7 +4310,7 @@
<para>
Disable or enable automatic reconnect for dropped
connections. [Q: Is the default whatever the default is for
- the client library (which varies)?]
+ the client library (which varies for different versions)?]
</para>
<para>
@@ -4351,7 +4360,7 @@
Disable or enable warnings. This setting is enabled by
default. With this setting enabled,
<command>mysqltest</command> uses <literal>SHOW
- WARNINGS</literal> to display any warnings produced by
+ WARNINGS</literal> to display any warnings produced by SQL
statements.
</para>
</listitem>
@@ -4544,8 +4553,9 @@
<para>
Begin an <literal>if</literal> block, which continues until
an <literal>end</literal> line. <command>mysqltest</command>
- executes the block if the expression is true. [See XXX for
- more information on flow-control constructs]
+ executes the block if the expression is true. See
+ <xref linkend="mysqltest-flow-control"/>, for information on
+ flow-control constructs.
</para>
<para>
@@ -4571,15 +4581,19 @@
</para>
<para>
- Assign a value to a variable. If the <literal>let</literal>
- command is specified as a normal command (that is, not
- beginning with ‘<literal>--</literal>’), the
- value contains everything up to the command delimiter, and
- thus can span multiple lines. <command>mysqltest</command>
+ Assign a value to a variable. <command>mysqltest</command>
aborts with an error if the value is erroneous.
</para>
<para>
+ If the <literal>let</literal> command is specified as a
+ normal command (that is, not beginning with
+ ‘<literal>--</literal>’), the value contains
+ everything up to the command delimiter, and thus can span
+ multiple lines.
+ </para>
+
+ <para>
[Q: The <literal>$</literal> seems to be implied if not
present?]
</para>
@@ -4813,13 +4827,18 @@
</para>
<para>
- Compare the result from the current test? with the contents
- of the named file. If the content does not match or there is
- some other error, write the result to
+ Compare the result [from the current test?] with the
+ contents of the named file. If the content does not match or
+ there is some other error, write the result to
<filename>r/<replaceable>file_name</replaceable>.reject</filename>.
</para>
<para>
+ [Q: So this assumes that there is an <filename>r</filename>
+ directory under the current directory?
+ </para>
+
+ <para>
[Ask these questions, but base them on the Wiki text, not my
rewrite in the previous para.] [Q: So, does that mean
<replaceable>file_name</replaceable> is given without the
@@ -4933,7 +4952,8 @@
</para>
<para>
- Reads test input from the named file.
+ Reads test input from the named file. A sourced file can use
+ <literal>source</literal> to read other files.
</para>
<para>
@@ -4948,7 +4968,7 @@
</para>
<para>
- [Q: Can this be used recursively? Max recursion level?]
+ [Q: Max recursion level?]
</para>
</listitem>
@@ -5076,8 +5096,9 @@
Begin a <literal>while</literal> loop block, which continues
until an <literal>end</literal> line.
<command>mysqltest</command> executes the block repeatedly
- as long as the expression is true. [See XXX for more
- information on flow-control constructs]
+ as long as the expression is true. See
+ <xref linkend="mysqltest-flow-control"/>, for information on
+ flow-control constructs.
</para>
<para>
@@ -5097,6 +5118,13 @@
<title><command>mysqltest</command> Variables</title>
<para>
+ [Cover <literal>let</literal>, <literal>dec</literal>,
+ <literal>inc</literal>. Cover use in <literal>eval</literal>,
+ <literal>exec</literal>, <literal>system</literal>, and
+ flow-control statements.
+ </para>
+
+ <para>
Variables:
</para>
@@ -5133,6 +5161,10 @@
<title><command>mysqltest</command> Flow Control Constructs</title>
<para>
+ [Cover <literal>exit</literal> here?]
+ </para>
+
+ <para>
The syntax for <literal>if</literal> and
<literal>while</literal> blocks looks like this:
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1524 - in trunk: . mysqltest | paul | 8 Mar |
