From: paul Date: December 20 2005 6:54pm Subject: svn commit - mysqldoc@docsrva: r604 - in trunk: . refman-4.1 refman-5.0 refman-common List-Archive: http://lists.mysql.com/commits/292 Message-Id: <200512201854.jBKIsk2d006221@docsrva.mysql.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Author: paul Date: 2005-12-20 19:54:44 +0100 (Tue, 20 Dec 2005) New Revision: 604 Log: r4965@frost: paul | 2005-12-20 12:32:13 -0600 Reformat. Modified: trunk/ trunk/refman-4.1/connector-j.xml trunk/refman-4.1/connector-net.xml trunk/refman-4.1/data-types.xml trunk/refman-4.1/database-administration.xml trunk/refman-4.1/ndbcluster.xml trunk/refman-4.1/problems.xml trunk/refman-4.1/sql-syntax.xml trunk/refman-5.0/connector-j.xml trunk/refman-5.0/connector-net.xml trunk/refman-5.0/data-types.xml trunk/refman-5.0/database-administration.xml trunk/refman-5.0/extending-mysql.xml trunk/refman-5.0/introduction.xml trunk/refman-5.0/ndbcluster.xml trunk/refman-5.0/problems.xml trunk/refman-5.0/sql-syntax.xml trunk/refman-common/news-4.1.xml trunk/refman-common/news-5.0.xml trunk/refman-common/news-5.1.xml Property changes on: trunk ___________________________________________________________________ Name: svk:merge - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:4964 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1694 + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:4965 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:1694 Modified: trunk/refman-4.1/connector-j.xml =================================================================== --- trunk/refman-4.1/connector-j.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-4.1/connector-j.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -466,7 +466,7 @@ cStmt.registerOutParameter("inOutParam", Types.INTEGER); ... - + @@ -4280,8 +4280,8 @@ - My application throws an SQLException 'No Suitable Driver'. - Why is this happening? + My application throws an SQLException 'No Suitable + Driver'. Why is this happening? Modified: trunk/refman-4.1/connector-net.xml =================================================================== --- trunk/refman-4.1/connector-net.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-4.1/connector-net.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -202,8 +202,8 @@ - MySqlCommand: Represents an SQL statement to - execute against a MySQL database. + MySqlCommand: Represents an SQL statement + to execute against a MySQL database. Modified: trunk/refman-4.1/data-types.xml =================================================================== --- trunk/refman-4.1/data-types.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-4.1/data-types.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -4348,18 +4348,18 @@ in contrast to all other data types, for which storage is allocated once per column when the table is opened. - + In some cases, it may be desirable to store binary data such as media files in BLOB or TEXT columns. You may find MySQL's string - handling functions useful for working with such data. See + handling functions useful for working with such data. See . For security and other reasons, it is usually preferable to do so using application code rather than allowing application users the FILE privilege. You can discuss specifics for - various languages and platforms in the MySQL Forums - (). + various languages and platforms in the MySQL Forums + (). Modified: trunk/refman-4.1/database-administration.xml =================================================================== --- trunk/refman-4.1/database-administration.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-4.1/database-administration.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -3470,8 +3470,8 @@ point to a directory on a memory-based filesystem or to a directory that is cleared when the server host restarts. For more information about the storage location of - temporary files, see . - A replication slave needs some of its temporary files to + temporary files, see . A + replication slave needs some of its temporary files to survive a machine restart so that it can replicate temporary tables or LOAD DATA INFILE operations. If files in the temporary file directory are Modified: trunk/refman-4.1/ndbcluster.xml =================================================================== --- trunk/refman-4.1/ndbcluster.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-4.1/ndbcluster.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -544,7 +544,7 @@ are simple: all that is needed is a production release of MySQL-max 4.1.3 or newer; you must use the -max version of - MySQL in order to have Cluster support. It is not + MySQL in order to have Cluster support. It is not necessary to compile MySQL yourself merely to be able to use Cluster. In this How-To, we assume that you are using the -max binary appropriate to your Linux, @@ -4383,10 +4383,10 @@ By default, only the startup message is sent to - stdout, with the remaining event - reporting level defaults being set to 0. The reason for this - is that these messages are also sent to the management - server's cluster log. + stdout, with the remaining event reporting + level defaults being set to 0. The reason for this is that + these messages are also sent to the management server's + cluster log. @@ -8805,8 +8805,9 @@ Transaction Handling: - + + NDB Cluster supports only the @@ -8814,7 +8815,7 @@ isolation level. - + There is no partial rollback of transactions. A @@ -8822,7 +8823,7 @@ rollback of the entire transaction. - + Important: If a @@ -8837,6 +8838,7 @@ from a separate table. + Modified: trunk/refman-4.1/problems.xml =================================================================== --- trunk/refman-4.1/problems.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-4.1/problems.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -768,15 +768,15 @@ For more information about the mysqli extension, see . - + It may also be possible to compile the older mysql extension against the new MySQL client library. This is beyond the scope of this Manual; consult the PHP documentation for more information. You also be able to - obtain assistance with these issues in our + obtain assistance with these issues in our MySQL with PHP - forum. + forum. Modified: trunk/refman-4.1/sql-syntax.xml =================================================================== --- trunk/refman-4.1/sql-syntax.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-4.1/sql-syntax.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -5821,16 +5821,15 @@ REPLACE is a MySQL extension to the SQL - standard. It either inserts, or deletes - and inserts. If you're looking for a statement that follows - the SQL standard, and that either inserts or - updates, look for the - INSERT … ON DUPLICATE KEY UPDATE - statement; see . - INSERT … ON DUPLICATE KEY UPDATE - is available as of MySQL 4.1.0. + standard. It either inserts, or deletes and + inserts. If you're looking for a statement that follows the SQL + standard, and that either inserts or + updates, look for the INSERT + … ON DUPLICATE KEY UPDATE statement; see + . INSERT … ON DUPLICATE + KEY UPDATE is available as of MySQL 4.1.0. - + Note that unless the table has a PRIMARY KEY or UNIQUE index, using a Modified: trunk/refman-5.0/connector-j.xml =================================================================== --- trunk/refman-5.0/connector-j.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-5.0/connector-j.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -466,7 +466,7 @@ cStmt.registerOutParameter("inOutParam", Types.INTEGER); ... - + @@ -4280,8 +4280,8 @@ - My application throws an SQLException 'No Suitable Driver'. - Why is this happening? + My application throws an SQLException 'No Suitable + Driver'. Why is this happening? Modified: trunk/refman-5.0/connector-net.xml =================================================================== --- trunk/refman-5.0/connector-net.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-5.0/connector-net.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -223,8 +223,8 @@ - MySqlCommand: Represents an SQL statement to - execute against a MySQL database. + MySqlCommand: Represents an SQL statement + to execute against a MySQL database. Modified: trunk/refman-5.0/data-types.xml =================================================================== --- trunk/refman-5.0/data-types.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-5.0/data-types.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -4152,18 +4152,18 @@ in contrast to all other data types, for which storage is allocated once per column when the table is opened. - + In some cases, it may be desirable to store binary data such as media files in BLOB or TEXT columns. You may find MySQL's string - handling functions useful for working with such data. See + handling functions useful for working with such data. See . For security and other reasons, it is usually preferable to do so using application code rather than allowing application users the FILE privilege. You can discuss specifics for - various languages and platforms in the MySQL Forums - (). + various languages and platforms in the MySQL Forums + (). Modified: trunk/refman-5.0/database-administration.xml =================================================================== --- trunk/refman-5.0/database-administration.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-5.0/database-administration.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -4197,14 +4197,13 @@ as a replication slave, you should not set to point to a directory on a memory-based filesystem or to a directory that is cleared - when the server host restarts. - For more information about the storage location of - temporary files, see . - A replication slave needs - some of its temporary files to survive a machine restart - so that it can replicate temporary tables or LOAD - DATA INFILE operations. If files in the - temporary file directory are lost when the server + when the server host restarts. For more information about + the storage location of temporary files, see + . A replication slave + needs some of its temporary files to survive a machine + restart so that it can replicate temporary tables or + LOAD DATA INFILE operations. If files + in the temporary file directory are lost when the server restarts, replication fails. Modified: trunk/refman-5.0/extending-mysql.xml =================================================================== --- trunk/refman-5.0/extending-mysql.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-5.0/extending-mysql.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -678,7 +678,8 @@ - AGGREGATE CREATE FUNCTION STRING REAL INTEGER DECIMAL RETURNS SONAME + AGGREGATE CREATE FUNCTION STRING REAL INTEGER DECIMAL RETURNS + SONAME Modified: trunk/refman-5.0/introduction.xml =================================================================== --- trunk/refman-5.0/introduction.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-5.0/introduction.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -604,7 +604,8 @@ The VARCHAR data type as implemented in MySQL 5.0 is more efficient than in previous versions, due to the elimination of the old (and - nonstandard) removal of trailing spaces during retrieval. + nonstandard) removal of trailing spaces during + retrieval. @@ -2490,8 +2491,8 @@ - Through MySQL 5.0, only InnoDB tables support - foreign keys. See + Through MySQL 5.0, only InnoDB tables + support foreign keys. See . Foreign key support in MyISAM tables is scheduled for implementation in MySQL 5.2. See . Modified: trunk/refman-5.0/ndbcluster.xml =================================================================== --- trunk/refman-5.0/ndbcluster.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-5.0/ndbcluster.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -550,7 +550,7 @@ are simple: all that is needed is a production release of MySQL-max ¤t-series;; you must use the -max version of - MySQL in order to have Cluster support. It is not + MySQL in order to have Cluster support. It is not necessary to compile MySQL yourself merely to be able to use Cluster. In this How-To, we assume that you are using the -max binary appropriate to your Linux, @@ -4396,10 +4396,10 @@ By default, only the startup message is sent to - stdout, with the remaining event - reporting level defaults being set to 0. The reason for this - is that these messages are also sent to the management - server's cluster log. + stdout, with the remaining event reporting + level defaults being set to 0. The reason for this is that + these messages are also sent to the management server's + cluster log. @@ -8781,8 +8781,9 @@ Transaction Handling: - + + NDB Cluster supports only the @@ -8790,7 +8791,7 @@ isolation level. - + There is no partial rollback of transactions. A @@ -8798,7 +8799,7 @@ rollback of the entire transaction. - + Important: If a @@ -8813,8 +8814,8 @@ from a separate table. + - Modified: trunk/refman-5.0/problems.xml =================================================================== --- trunk/refman-5.0/problems.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-5.0/problems.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -768,15 +768,15 @@ mysqli extension, see . - + It may also be possible to compile the older mysql extension against the new MySQL client library. This is beyond the scope of this Manual; consult the PHP documentation for more information. You also be able to - obtain assistance with these issues in our + obtain assistance with these issues in our MySQL with PHP - forum. + forum. Modified: trunk/refman-5.0/sql-syntax.xml =================================================================== --- trunk/refman-5.0/sql-syntax.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-5.0/sql-syntax.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -5889,14 +5889,14 @@ REPLACE is a MySQL extension to the SQL - standard. It either inserts, or deletes - and inserts. If you're looking for a statement that follows - the SQL standard, and that either inserts or - updates, look for the - INSERT … ON DUPLICATE KEY UPDATE - statement; see . + standard. It either inserts, or deletes and + inserts. If you're looking for a statement that follows the SQL + standard, and that either inserts or + updates, look for the INSERT + … ON DUPLICATE KEY UPDATE statement; see + . - + Note that unless the table has a PRIMARY KEY or UNIQUE index, using a Modified: trunk/refman-common/news-4.1.xml =================================================================== --- trunk/refman-common/news-4.1.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-common/news-4.1.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -365,13 +365,13 @@ - + NDB Cluster: Creating a table with packed keys failed silently. NDB now supports the PACK_KEYS option to CREATE - TABLE correctly. (Bug #14514) + TABLE correctly. (Bug #14514) Modified: trunk/refman-common/news-5.0.xml =================================================================== --- trunk/refman-common/news-5.0.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-common/news-5.0.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -330,13 +330,13 @@ - + NDB Cluster: Creating a table with packed keys failed silently. NDB now supports the PACK_KEYS option to CREATE - TABLE correctly. (Bug #14514) + TABLE correctly. (Bug #14514) Modified: trunk/refman-common/news-5.1.xml =================================================================== --- trunk/refman-common/news-5.1.xml 2005-12-20 18:52:00 UTC (rev 603) +++ trunk/refman-common/news-5.1.xml 2005-12-20 18:54:44 UTC (rev 604) @@ -89,20 +89,9 @@ + - The server produced a non-descriptive error message when - attempting to insert an out-of-range value into a partitioned - table. The server now returns the error Table has - no partition for value - val, where - val is the out-of-range value. - (Bug #15524) - - - - - It was not possible to reorganize a partition reusing a discarded partition name. @@ -140,8 +129,8 @@ NDB Cluster: The - option for perror did not function. - (Bug #15486) + option for perror did not function. (Bug + #15486)