From: paul Date: December 7 2005 3:39pm Subject: svn commit - mysqldoc@docsrva: r512 - in trunk: . refman-4.1 refman-5.0 refman-5.1 List-Archive: http://lists.mysql.com/commits/16 Message-Id: <200512071539.jB7FdokC031442@docsrva.mysql.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 @@ - + %fixedchars.entities; %title.entities; - + %versions.entities; ]> @@ -168,15 +168,15 @@ The test system consist of a test language interpreter (mysqltest), a shell script to run all - tests(mysql-test-run), the actual test + tests (mysql-test-run), 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 make test or - mysql-test/mysql-test-run from the source - root. If you have installed a binary distribution, - cd to the install root (eg. - /usr/local/mysql), and do - scripts/mysql-test-run. All tests should + mysql-test/mysql-test-run from the source + root. If you have installed a binary distribution, change + location to the install root (for example, + /usr/local/mysql), and run + scripts/mysql-test-run. 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 . @@ -185,11 +185,11 @@ From MySQL 4.1 on, if you have a copy of mysqld 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 9306 and - 9307. If one of those ports is taken, you - should edit mysql-test-run 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 9306 or + 9307. If either of those ports is taken, + you should edit mysql-test-run and change + the values of the master and/or slave port to one that is available. @@ -203,11 +203,11 @@ You can run one individual test case with - mysql-test/mysql-test-run test_name. + mysql-test/mysql-test-run test_name. - If one test fails, you should test running + If one test fails, you should run mysql-test-run with the option to check whether any other tests fail. @@ -241,17 +241,17 @@ A test case consists of ; terminated statements and is similar to the input of mysql 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, sleep). - All queries that produce results---for example, - SELECT, SHOW, - EXPLAIN, etc., must be preceded with + All queries that produce results—for example, + SELECT, SHOW, or + EXPLAIN—must be preceded with @/path/to/result/file. The file must contain the expected results. An easy way to generate the result file is to run mysqltest -r < @@ -259,15 +259,15 @@ mysql-test 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 od -c 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 mysqltest -r 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 od -c 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 + mysqltest -r as you only have to do it + when you find a bug. @@ -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 - . All our - standard binaries should pass the test suite! + . All our standard + binaries should pass the test suite! 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 @@ - + %fixedchars.entities; %title.entities; - + %versions.entities; ]> @@ -168,15 +168,15 @@ The test system consist of a test language interpreter (mysqltest), a shell script to run all - tests(mysql-test-run), the actual test + tests (mysql-test-run), 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 make test or - mysql-test/mysql-test-run from the source - root. If you have installed a binary distribution, - cd to the install root (eg. - /usr/local/mysql), and do - scripts/mysql-test-run. All tests should + mysql-test/mysql-test-run from the source + root. If you have installed a binary distribution, change + location to the install root (for example, + /usr/local/mysql), and run + scripts/mysql-test-run. 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 . @@ -184,21 +184,21 @@ If you have a copy of mysqld 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 - 9306 and 9307. If one of - those ports is taken, you should edit + 9306 or 9307. If either + of those ports is taken, you should edit mysql-test-run and change the values of the master and/or slave port to one that is available. You can run one individual test case with - mysql-test/mysql-test-run test_name. + mysql-test/mysql-test-run test_name. - If one test fails, you should test running + If one test fails, you should run mysql-test-run with the option to check whether any other tests fail. @@ -232,17 +232,17 @@ A test case consists of ; terminated statements and is similar to the input of mysql 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, sleep). - All queries that produce results---for example, - SELECT, SHOW, - EXPLAIN, etc., must be preceded with + All queries that produce results—for example, + SELECT, SHOW, or + EXPLAIN—must be preceded with @/path/to/result/file. The file must contain the expected results. An easy way to generate the result file is to run mysqltest -r < @@ -250,15 +250,15 @@ mysql-test 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 od -c 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 mysqltest -r 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 od -c 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 + mysqltest -r as you only have to do it + when you find a bug. 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 @@ - + %fixedchars.entities; %title.entities; - + %versions.entities; ]> @@ -168,15 +168,15 @@ The test system consist of a test language interpreter (mysqltest), a shell script to run all - tests(mysql-test-run), the actual test + tests (mysql-test-run), 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 make test or - mysql-test/mysql-test-run from the source - root. If you have installed a binary distribution, - cd to the install root (eg. - /usr/local/mysql), and do - scripts/mysql-test-run. All tests should + mysql-test/mysql-test-run from the source + root. If you have installed a binary distribution, change + location to the install root (for example, + /usr/local/mysql), and run + scripts/mysql-test-run. 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 . @@ -184,21 +184,21 @@ If you have a copy of mysqld 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 - 9306 and 9307. If one of - those ports is taken, you should edit + 9306 or 9307. If either + of those ports is taken, you should edit mysql-test-run and change the values of the master and/or slave port to one that is available. You can run one individual test case with - mysql-test/mysql-test-run test_name. + mysql-test/mysql-test-run test_name. - If one test fails, you should test running + If one test fails, you should run mysql-test-run with the option to check whether any other tests fail. @@ -232,17 +232,17 @@ A test case consists of ; terminated statements and is similar to the input of mysql 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, sleep). - All queries that produce results---for example, - SELECT, SHOW, - EXPLAIN, etc., must be preceded with + All queries that produce results—for example, + SELECT, SHOW, or + EXPLAIN—must be preceded with @/path/to/result/file. The file must contain the expected results. An easy way to generate the result file is to run mysqltest -r < @@ -250,15 +250,15 @@ mysql-test 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 od -c 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 mysqltest -r 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 od -c 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 + mysqltest -r as you only have to do it + when you find a bug.