Author: paul
Date: 2005-12-07 16:39:50 +0100 (Wed, 07 Dec 2005)
New Revision: 512
Log:
r4567@frost: paul | 2005-12-07 08:46:24 -0600
Minor mysqltest tweaks.
Modified:
trunk/
trunk/refman-4.1/extending-mysql.xml
trunk/refman-5.0/extending-mysql.xml
trunk/refman-5.1/extending-mysql.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:4559
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1505
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:4567
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1505
Modified: trunk/refman-4.1/extending-mysql.xml
===================================================================
--- trunk/refman-4.1/extending-mysql.xml 2005-12-07 15:06:14 UTC (rev 511)
+++ trunk/refman-4.1/extending-mysql.xml 2005-12-07 15:39:50 UTC (rev 512)
@@ -1,12 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
<!ENTITY % fixedchars.entities SYSTEM "../refman-common/fixedchars.ent">
%fixedchars.entities;
<!ENTITY % title.entities SYSTEM "../refman-common/titles.en.ent">
%title.entities;
- <!ENTITY % versions.entities SYSTEM "versions.ent">
+ <!ENTITY % versions.entities SYSTEM "versions.ent">
%versions.entities;
]>
<chapter id="extending-mysql">
@@ -168,15 +168,15 @@
<para>
The test system consist of a test language interpreter
(<command>mysqltest</command>), a shell script to run all
- tests(<command>mysql-test-run</command>), the actual test
+ tests (<command>mysql-test-run</command>), the actual test
cases written in a special test language, and their expected
results. To run the test suite on your system after a build,
type <command>make test</command> or
- <literal>mysql-test/mysql-test-run</literal> from the source
- root. If you have installed a binary distribution,
- <literal>cd</literal> to the install root (eg.
- <literal>/usr/local/mysql</literal>), and do
- <literal>scripts/mysql-test-run</literal>. All tests should
+ <command>mysql-test/mysql-test-run</command> from the source
+ root. If you have installed a binary distribution, change
+ location to the install root (for example,
+ <filename>/usr/local/mysql</filename>), and run
+ <command>scripts/mysql-test-run</command>. All tests should
succeed. If not, you should try to find out why and report the
problem if this is a bug in MySQL. See
<xref linkend="reporting-mysqltest-bugs"/>.
@@ -185,11 +185,11 @@
<para>
From MySQL 4.1 on, if you have a copy of
<command>mysqld</command> running on the machine where you
- want to run the test suite you do not have to stop it, as long
- as it is not using ports <literal>9306</literal> and
- <literal>9307</literal>. If one of those ports is taken, you
- should edit <command>mysql-test-run</command> and change the
- values of the master and/or slave port to one that is
+ want to run the test suite, you do not have to stop it, as
+ long as it is not using ports <literal>9306</literal> or
+ <literal>9307</literal>. If either of those ports is taken,
+ you should edit <command>mysql-test-run</command> and change
+ the values of the master and/or slave port to one that is
available.
</para>
@@ -203,11 +203,11 @@
<para>
You can run one individual test case with
- <literal>mysql-test/mysql-test-run test_name</literal>.
+ <command>mysql-test/mysql-test-run test_name</command>.
</para>
<para>
- If one test fails, you should test running
+ If one test fails, you should run
<command>mysql-test-run</command> with the
<option>--force</option> option to check whether any other
tests fail.
@@ -241,17 +241,17 @@
A test case consists of <literal>;</literal> terminated
statements and is similar to the input of
<command>mysql</command> command-line client. A statement
- by default is a query to be sent to MySQL server, unless
- it is recognized as internal command (eg.
+ by default is a SQL statment to be sent to MySQL server,
+ unless it is recognized as internal command (for example,
<command>sleep</command>).
</para>
</listitem>
<listitem>
<para>
- All queries that produce results---for example,
- <literal>SELECT</literal>, <literal>SHOW</literal>,
- <literal>EXPLAIN</literal>, etc., must be preceded with
+ All queries that produce results—for example,
+ <literal>SELECT</literal>, <literal>SHOW</literal>, or
+ <literal>EXPLAIN</literal>—must be preceded with
<replaceable>@/path/to/result/file</replaceable>. The file
must contain the expected results. An easy way to generate
the result file is to run <command>mysqltest -r <
@@ -259,15 +259,15 @@
<filename>mysql-test</filename> directory, and then edit
the generated result files, if needed, to adjust them to
the expected output. In that case, be very careful about
- not adding or deleting any invisible characters --- make
- sure to only change the text and/or delete lines. If you
- have to insert a line, make sure that the fields are
- separated by a hard tab, and that there is a hard tab at
- the end. You may want to use <command>od -c</command> to
- make sure that your text editor has not messed anything up
- during edit. We hope that you never have to edit the
- output of <command>mysqltest -r</command> as you only have
- to do it when you find a bug.
+ not adding or deleting any invisible characters. Make sure
+ to only change the text and/or delete lines. If you have
+ to insert a line, make sure that the fields are separated
+ by a hard tab, and that there is a hard tab at the end.
+ You may want to use <command>od -c</command> to make sure
+ that your text editor has not messed anything up during
+ edit. We hope that you never have to edit the output of
+ <command>mysqltest -r</command> as you only have to do it
+ when you find a bug.
</para>
</listitem>
@@ -424,8 +424,8 @@
If you have compiled MySQL yourself, check our manual for
how to compile MySQL on your platform or, preferable, use
one of the binaries we have compiled for you at
- <ulink url="&base-url-downloads;"/>. All our
- standard binaries should pass the test suite!
+ <ulink url="&base-url-downloads;"/>. All our standard
+ binaries should pass the test suite!
</para>
</listitem>
Modified: trunk/refman-5.0/extending-mysql.xml
===================================================================
--- trunk/refman-5.0/extending-mysql.xml 2005-12-07 15:06:14 UTC (rev 511)
+++ trunk/refman-5.0/extending-mysql.xml 2005-12-07 15:39:50 UTC (rev 512)
@@ -1,12 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
<!ENTITY % fixedchars.entities SYSTEM "../refman-common/fixedchars.ent">
%fixedchars.entities;
<!ENTITY % title.entities SYSTEM "../refman-common/titles.en.ent">
%title.entities;
- <!ENTITY % versions.entities SYSTEM "versions.ent">
+ <!ENTITY % versions.entities SYSTEM "versions.ent">
%versions.entities;
]>
<chapter id="extending-mysql">
@@ -168,15 +168,15 @@
<para>
The test system consist of a test language interpreter
(<command>mysqltest</command>), a shell script to run all
- tests(<command>mysql-test-run</command>), the actual test
+ tests (<command>mysql-test-run</command>), the actual test
cases written in a special test language, and their expected
results. To run the test suite on your system after a build,
type <command>make test</command> or
- <literal>mysql-test/mysql-test-run</literal> from the source
- root. If you have installed a binary distribution,
- <literal>cd</literal> to the install root (eg.
- <literal>/usr/local/mysql</literal>), and do
- <literal>scripts/mysql-test-run</literal>. All tests should
+ <command>mysql-test/mysql-test-run</command> from the source
+ root. If you have installed a binary distribution, change
+ location to the install root (for example,
+ <filename>/usr/local/mysql</filename>), and run
+ <command>scripts/mysql-test-run</command>. All tests should
succeed. If not, you should try to find out why and report the
problem if this is a bug in MySQL. See
<xref linkend="reporting-mysqltest-bugs"/>.
@@ -184,21 +184,21 @@
<para>
If you have a copy of <command>mysqld</command> running on the
- machine where you want to run the test suite you do not have
+ machine where you want to run the test suite you, do not have
to stop it, as long as it is not using ports
- <literal>9306</literal> and <literal>9307</literal>. If one of
- those ports is taken, you should edit
+ <literal>9306</literal> or <literal>9307</literal>. If either
+ of those ports is taken, you should edit
<command>mysql-test-run</command> and change the values of the
master and/or slave port to one that is available.
</para>
<para>
You can run one individual test case with
- <literal>mysql-test/mysql-test-run test_name</literal>.
+ <command>mysql-test/mysql-test-run test_name</command>.
</para>
<para>
- If one test fails, you should test running
+ If one test fails, you should run
<command>mysql-test-run</command> with the
<option>--force</option> option to check whether any other
tests fail.
@@ -232,17 +232,17 @@
A test case consists of <literal>;</literal> terminated
statements and is similar to the input of
<command>mysql</command> command-line client. A statement
- by default is a query to be sent to MySQL server, unless
- it is recognized as internal command (eg.
+ by default is a SQL statment to be sent to MySQL server,
+ unless it is recognized as internal command (for example,
<command>sleep</command>).
</para>
</listitem>
<listitem>
<para>
- All queries that produce results---for example,
- <literal>SELECT</literal>, <literal>SHOW</literal>,
- <literal>EXPLAIN</literal>, etc., must be preceded with
+ All queries that produce results—for example,
+ <literal>SELECT</literal>, <literal>SHOW</literal>, or
+ <literal>EXPLAIN</literal>—must be preceded with
<replaceable>@/path/to/result/file</replaceable>. The file
must contain the expected results. An easy way to generate
the result file is to run <command>mysqltest -r <
@@ -250,15 +250,15 @@
<filename>mysql-test</filename> directory, and then edit
the generated result files, if needed, to adjust them to
the expected output. In that case, be very careful about
- not adding or deleting any invisible characters --- make
- sure to only change the text and/or delete lines. If you
- have to insert a line, make sure that the fields are
- separated by a hard tab, and that there is a hard tab at
- the end. You may want to use <command>od -c</command> to
- make sure that your text editor has not messed anything up
- during edit. We hope that you never have to edit the
- output of <command>mysqltest -r</command> as you only have
- to do it when you find a bug.
+ not adding or deleting any invisible characters. Make sure
+ to only change the text and/or delete lines. If you have
+ to insert a line, make sure that the fields are separated
+ by a hard tab, and that there is a hard tab at the end.
+ You may want to use <command>od -c</command> to make sure
+ that your text editor has not messed anything up during
+ edit. We hope that you never have to edit the output of
+ <command>mysqltest -r</command> as you only have to do it
+ when you find a bug.
</para>
</listitem>
Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml 2005-12-07 15:06:14 UTC (rev 511)
+++ trunk/refman-5.1/extending-mysql.xml 2005-12-07 15:39:50 UTC (rev 512)
@@ -1,12 +1,12 @@
-<?xml version='1.0' encoding='utf-8'?>
+<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
+"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
[
<!ENTITY % fixedchars.entities SYSTEM "../refman-common/fixedchars.ent">
%fixedchars.entities;
<!ENTITY % title.entities SYSTEM "../refman-common/titles.en.ent">
%title.entities;
- <!ENTITY % versions.entities SYSTEM "versions.ent">
+ <!ENTITY % versions.entities SYSTEM "versions.ent">
%versions.entities;
]>
<chapter id="extending-mysql">
@@ -168,15 +168,15 @@
<para>
The test system consist of a test language interpreter
(<command>mysqltest</command>), a shell script to run all
- tests(<command>mysql-test-run</command>), the actual test
+ tests (<command>mysql-test-run</command>), the actual test
cases written in a special test language, and their expected
results. To run the test suite on your system after a build,
type <command>make test</command> or
- <literal>mysql-test/mysql-test-run</literal> from the source
- root. If you have installed a binary distribution,
- <literal>cd</literal> to the install root (eg.
- <literal>/usr/local/mysql</literal>), and do
- <literal>scripts/mysql-test-run</literal>. All tests should
+ <command>mysql-test/mysql-test-run</command> from the source
+ root. If you have installed a binary distribution, change
+ location to the install root (for example,
+ <filename>/usr/local/mysql</filename>), and run
+ <command>scripts/mysql-test-run</command>. All tests should
succeed. If not, you should try to find out why and report the
problem if this is a bug in MySQL. See
<xref linkend="reporting-mysqltest-bugs"/>.
@@ -184,21 +184,21 @@
<para>
If you have a copy of <command>mysqld</command> running on the
- machine where you want to run the test suite you do not have
+ machine where you want to run the test suite you, do not have
to stop it, as long as it is not using ports
- <literal>9306</literal> and <literal>9307</literal>. If one of
- those ports is taken, you should edit
+ <literal>9306</literal> or <literal>9307</literal>. If either
+ of those ports is taken, you should edit
<command>mysql-test-run</command> and change the values of the
master and/or slave port to one that is available.
</para>
<para>
You can run one individual test case with
- <literal>mysql-test/mysql-test-run test_name</literal>.
+ <command>mysql-test/mysql-test-run test_name</command>.
</para>
<para>
- If one test fails, you should test running
+ If one test fails, you should run
<command>mysql-test-run</command> with the
<option>--force</option> option to check whether any other
tests fail.
@@ -232,17 +232,17 @@
A test case consists of <literal>;</literal> terminated
statements and is similar to the input of
<command>mysql</command> command-line client. A statement
- by default is a query to be sent to MySQL server, unless
- it is recognized as internal command (eg.
+ by default is a SQL statment to be sent to MySQL server,
+ unless it is recognized as internal command (for example,
<command>sleep</command>).
</para>
</listitem>
<listitem>
<para>
- All queries that produce results---for example,
- <literal>SELECT</literal>, <literal>SHOW</literal>,
- <literal>EXPLAIN</literal>, etc., must be preceded with
+ All queries that produce results—for example,
+ <literal>SELECT</literal>, <literal>SHOW</literal>, or
+ <literal>EXPLAIN</literal>—must be preceded with
<replaceable>@/path/to/result/file</replaceable>. The file
must contain the expected results. An easy way to generate
the result file is to run <command>mysqltest -r <
@@ -250,15 +250,15 @@
<filename>mysql-test</filename> directory, and then edit
the generated result files, if needed, to adjust them to
the expected output. In that case, be very careful about
- not adding or deleting any invisible characters --- make
- sure to only change the text and/or delete lines. If you
- have to insert a line, make sure that the fields are
- separated by a hard tab, and that there is a hard tab at
- the end. You may want to use <command>od -c</command> to
- make sure that your text editor has not messed anything up
- during edit. We hope that you never have to edit the
- output of <command>mysqltest -r</command> as you only have
- to do it when you find a bug.
+ not adding or deleting any invisible characters. Make sure
+ to only change the text and/or delete lines. If you have
+ to insert a line, make sure that the fields are separated
+ by a hard tab, and that there is a hard tab at the end.
+ You may want to use <command>od -c</command> to make sure
+ that your text editor has not messed anything up during
+ edit. We hope that you never have to edit the output of
+ <command>mysqltest -r</command> as you only have to do it
+ when you find a bug.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r512 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 7 Dec |
