Author: paul
Date: 2006-06-16 16:03:41 +0200 (Fri, 16 Jun 2006)
New Revision: 2401
Log:
r11373@frost: paul | 2006-06-16 09:03:14 -0500
Tweaks.
Modified:
trunk/
trunk/mysqltest/command-reference.xml
trunk/mysqltest/tutorial.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10577
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:11370
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10577
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:11373
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7663
Modified: trunk/mysqltest/command-reference.xml
===================================================================
--- trunk/mysqltest/command-reference.xml 2006-06-16 13:45:03 UTC (rev 2400)
+++ trunk/mysqltest/command-reference.xml 2006-06-16 14:03:41 UTC (rev 2401)
@@ -10,27 +10,6 @@
<title><command>mysqltest</command> Language Reference</title>
<para>
- To do:
- </para>
-
- <itemizedlist>
-
- <listitem>
- <para>
- Verify the syntax of each command.
- </para>
- </listitem>
-
- <listitem>
- <para>
- Note: For now, the commands are in a single lexical list.
- Eventually, they should probably be categorized.
- </para>
- </listitem>
-
- </itemizedlist>
-
- <para>
This chapter describes the test language implemented by
<command>mysqltest</command>. The language allows input to contain a
mix of comments, commands executed by <command>mysqltest</command>
@@ -506,8 +485,8 @@
<para>
The last example assumes that the
- <literal>$MASTER_MYPORT</literal> variable ias been seen
- (perhaps as an environment variable).
+ <literal>$MASTER_MYPORT</literal> variable has already been
+ set (perhaps as an environment variable).
</para>
<para>
@@ -634,8 +613,8 @@
</para>
<programlisting>
---disable_abort_on_error
---enable_abort_on_error
+--disable_info
+--enable_info
</programlisting>
</listitem>
@@ -655,8 +634,8 @@
</para>
<programlisting>
---disable_abort_on_error
---enable_abort_on_error
+--disable_metadata
+--enable_metadata
</programlisting>
</listitem>
@@ -673,8 +652,8 @@
</para>
<programlisting>
---disable_abort_on_error
---enable_abort_on_error
+--disable_parsing
+--enable_parsing
</programlisting>
</listitem>
@@ -691,8 +670,8 @@
</para>
<programlisting>
---disable_abort_on_error
---enable_abort_on_error
+--disable_ps_protocol
+--enable_ps_protocol
</programlisting>
</listitem>
@@ -708,8 +687,8 @@
</para>
<programlisting>
---disable_abort_on_error
---enable_abort_on_error
+--disable_ps_warnings
+--enable_ps_warnings
</programlisting>
</listitem>
@@ -733,8 +712,8 @@
</para>
<programlisting>
---disable_abort_on_error
---enable_abort_on_error
+--disable_query_log
+--enable_query_log
</programlisting>
</listitem>
@@ -751,8 +730,8 @@
</para>
<programlisting>
---disable_abort_on_error
---enable_abort_on_error
+--disable_reconnect
+--enable_reconnect
</programlisting>
</listitem>
@@ -771,8 +750,8 @@
</para>
<programlisting>
---disable_abort_on_error
---enable_abort_on_error
+--disable_result_log
+--enable_result_log
</programlisting>
</listitem>
@@ -789,8 +768,8 @@
</para>
<programlisting>
---disable_abort_on_error
---enable_abort_on_error
+--disable_rpl_parse
+--enable_rpl_parse
</programlisting>
</listitem>
@@ -809,8 +788,8 @@
</para>
<programlisting>
---disable_abort_on_error
---enable_abort_on_error
+--disable_warnings
+--enable_warnings
</programlisting>
</listitem>
@@ -844,8 +823,8 @@
</para>
<programlisting>
-echo "should return only 1 row";
--echo "Another sql_mode test"
+echo "should return only 1 row";
</programlisting>
</listitem>
@@ -1131,7 +1110,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
+ executes the block if the expression is true. There is no
+ provision for <literal>else</literal> with
+ <literal>if</literal>. See
<xref linkend="mysqltest-flow-control"/>, for further
information about <literal>if</literal> statements.
</para>
@@ -1293,6 +1274,12 @@
--real_sleep 10
real_sleep 5;
</programlisting>
+
+ <para>
+ Try not to use <literal>sleep</literal> or
+ <literal>real_sleep</literal> commands more than necessary.
+ The more of them there are, the slower the test suite becomes.
+ </para>
</listitem>
<listitem>
@@ -1634,6 +1621,12 @@
--real_sleep 10
real_sleep 5;
</programlisting>
+
+ <para>
+ Try not to use <literal>sleep</literal> or
+ <literal>real_sleep</literal> commands more than necessary.
+ The more of them there are, the slower the test suite becomes.
+ </para>
</listitem>
<listitem>
@@ -1933,11 +1926,6 @@
<title><command>mysqltest</command> Flow Control Constructs</title>
<para>
- There is no provision for <literal>else</literal> with
- <literal>if</literal>.
- </para>
-
- <para>
The syntax for <literal>if</literal> and <literal>while</literal>
blocks looks like this:
</para>
@@ -1963,6 +1951,11 @@
</para>
<para>
+ There is no provision for <literal>else</literal> with
+ <literal>if</literal>.
+ </para>
+
+ <para>
For a <literal>while</literal> loop, make sure that the loop
includes some exit condition that eventually occurs. This can be
done by writing <replaceable>expr</replaceable> so that it becomes
@@ -2074,7 +2067,8 @@
might be difficult to characterize all possible errors that could
occur. In this case, <literal>disable_abort_on_error</literal> is
useful for causing <command>mysqltest</command> to continue
- processing input. This can be helpful for the following purposes:
+ processing input. This can be helpful in the following
+ circumstances:
</para>
<itemizedlist>
Modified: trunk/mysqltest/tutorial.xml
===================================================================
--- trunk/mysqltest/tutorial.xml 2006-06-16 13:45:03 UTC (rev 2400)
+++ trunk/mysqltest/tutorial.xml 2006-06-16 14:03:41 UTC (rev 2401)
@@ -1167,7 +1167,10 @@
To sleep between statements, use the
<command>sleep</command> command. It supports fractions of a
second. For example, <command>sleep 1.3;</command> sleeps
- 1.3 seconds.
+ 1.3 seconds. Try not to use <literal>sleep</literal> or
+ <literal>real_sleep</literal> commands more than necessary.
+ The more of them there are, the slower the test suite
+ becomes.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2401 - in trunk: . mysqltest | paul | 16 Jun |
