Author: paul
Date: 2008-04-15 23:25:56 +0200 (Tue, 15 Apr 2008)
New Revision: 10493
Log:
r30730@frost: paul | 2008-04-15 16:22:45 -0500
Clarify wording for the meaning of SHOW WARNINGS. (Kostja, Davi)
Modified:
trunk/it/refman-5.1/sql-syntax.xml
trunk/pt/refman-5.1/sql-syntax.xml
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-6.0/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30706
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30781
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30730
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30781
Modified: trunk/it/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/it/refman-5.1/sql-syntax.xml 2008-04-15 20:21:57 UTC (rev 10492)
+++ trunk/it/refman-5.1/sql-syntax.xml 2008-04-15 21:25:56 UTC (rev 10493)
Changed blocks: 2, Lines Added: 14, Lines Deleted: 13; 2521 bytes
@@ -13291,13 +13291,13 @@
<literal>InnoDB</literal> processes <literal>TRUNCATE
TABLE</literal> by deleting rows one by one if there are any
<literal>FOREIGN KEY</literal> constraints that reference the
- table. If there are no <literal>FOREIGN KEY</literal> constraints,
- <literal>InnoDB</literal> performs fast truncation by dropping
- the original table and creating an empty one with the same
- definition, which is much faster than deleting rows one by one.
- The <literal>AUTO_INCREMENT</literal> counter is reset by
- <literal>TRUNCATE TABLE</literal>, regardless of whether there
- is a <literal>FOREIGN KEY</literal> constraint.
+ table. If there are no <literal>FOREIGN KEY</literal>
+ constraints, <literal>InnoDB</literal> performs fast truncation
+ by dropping the original table and creating an empty one with
+ the same definition, which is much faster than deleting rows one
+ by one. The <literal>AUTO_INCREMENT</literal> counter is reset
+ by <literal>TRUNCATE TABLE</literal>, regardless of whether
+ there is a <literal>FOREIGN KEY</literal> constraint.
</para>
<para>
@@ -23956,15 +23956,16 @@
<para>
<literal>SHOW WARNINGS</literal> shows the error, warning, and
note messages that resulted from the last statement that
- generated messages, or nothing if the last statement that used
- a table generated no messages. A related statement,
- <literal>SHOW ERRORS</literal>, shows only the errors. See
- <xref linkend="show-errors"/>.
+ generated messages. It shows nothing if the last statement
+ used a table and generated no messages. (That is, a statement
+ that uses a table but generates no messages clears the message
+ list.) Statements that do not use tables and do not generate
+ messages have no effect on the message list.
</para>
<para>
- The list of messages is reset for each new statement that uses
- a table.
+ A related statement, <literal>SHOW ERRORS</literal>, shows
+ only the errors. See <xref linkend="show-errors"/>.
</para>
<para>
Modified: trunk/pt/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/pt/refman-5.1/sql-syntax.xml 2008-04-15 20:21:57 UTC (rev 10492)
+++ trunk/pt/refman-5.1/sql-syntax.xml 2008-04-15 21:25:56 UTC (rev 10493)
Changed blocks: 2, Lines Added: 14, Lines Deleted: 13; 2521 bytes
@@ -13291,13 +13291,13 @@
<literal>InnoDB</literal> processes <literal>TRUNCATE
TABLE</literal> by deleting rows one by one if there are any
<literal>FOREIGN KEY</literal> constraints that reference the
- table. If there are no <literal>FOREIGN KEY</literal> constraints,
- <literal>InnoDB</literal> performs fast truncation by dropping
- the original table and creating an empty one with the same
- definition, which is much faster than deleting rows one by one.
- The <literal>AUTO_INCREMENT</literal> counter is reset by
- <literal>TRUNCATE TABLE</literal>, regardless of whether there
- is a <literal>FOREIGN KEY</literal> constraint.
+ table. If there are no <literal>FOREIGN KEY</literal>
+ constraints, <literal>InnoDB</literal> performs fast truncation
+ by dropping the original table and creating an empty one with
+ the same definition, which is much faster than deleting rows one
+ by one. The <literal>AUTO_INCREMENT</literal> counter is reset
+ by <literal>TRUNCATE TABLE</literal>, regardless of whether
+ there is a <literal>FOREIGN KEY</literal> constraint.
</para>
<para>
@@ -23956,15 +23956,16 @@
<para>
<literal>SHOW WARNINGS</literal> shows the error, warning, and
note messages that resulted from the last statement that
- generated messages, or nothing if the last statement that used
- a table generated no messages. A related statement,
- <literal>SHOW ERRORS</literal>, shows only the errors. See
- <xref linkend="show-errors"/>.
+ generated messages. It shows nothing if the last statement
+ used a table and generated no messages. (That is, a statement
+ that uses a table but generates no messages clears the message
+ list.) Statements that do not use tables and do not generate
+ messages have no effect on the message list.
</para>
<para>
- The list of messages is reset for each new statement that uses
- a table.
+ A related statement, <literal>SHOW ERRORS</literal>, shows
+ only the errors. See <xref linkend="show-errors"/>.
</para>
<para>
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2008-04-15 20:21:57 UTC (rev 10492)
+++ trunk/refman-4.1/sql-syntax.xml 2008-04-15 21:25:56 UTC (rev 10493)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 7; 1438 bytes
@@ -17978,16 +17978,17 @@
<para>
<literal>SHOW WARNINGS</literal> shows the error, warning, and
note messages that resulted from the last statement that
- generated messages, or nothing if the last statement that used
- a table generated no messages. This statement is implemented
- as of MySQL 4.1.0. A related statement, <literal>SHOW
- ERRORS</literal>, shows only the errors. See
- <xref linkend="show-errors"/>.
+ generated messages. It shows nothing if the last statement
+ used a table and generated no messages. (That is, a statement
+ that uses a table but generates no messages clears the message
+ list.) Statements that do not use tables and do not generate
+ messages have no effect on the message list.
</para>
<para>
- The list of messages is reset for each new statement that uses
- a table.
+ <literal>SHOW WARNINGS</literal> is implemented as of MySQL
+ 4.1.0. A related statement, <literal>SHOW ERRORS</literal>,
+ shows only the errors. See <xref linkend="show-errors"/>.
</para>
<para>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2008-04-15 20:21:57 UTC (rev 10492)
+++ trunk/refman-5.0/sql-syntax.xml 2008-04-15 21:25:56 UTC (rev 10493)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 6; 1302 bytes
@@ -21204,15 +21204,16 @@
<para>
<literal>SHOW WARNINGS</literal> shows the error, warning, and
note messages that resulted from the last statement that
- generated messages, or nothing if the last statement that used
- a table generated no messages. A related statement,
- <literal>SHOW ERRORS</literal>, shows only the errors. See
- <xref linkend="show-errors"/>.
+ generated messages. It shows nothing if the last statement
+ used a table and generated no messages. (That is, a statement
+ that uses a table but generates no messages clears the message
+ list.) Statements that do not use tables and do not generate
+ messages have no effect on the message list.
</para>
<para>
- The list of messages is reset for each new statement that uses
- a table.
+ A related statement, <literal>SHOW ERRORS</literal>, shows
+ only the errors. See <xref linkend="show-errors"/>.
</para>
<para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2008-04-15 20:21:57 UTC (rev 10492)
+++ trunk/refman-5.1/sql-syntax.xml 2008-04-15 21:25:56 UTC (rev 10493)
Changed blocks: 2, Lines Added: 14, Lines Deleted: 13; 2512 bytes
@@ -13308,13 +13308,13 @@
<literal>InnoDB</literal> processes <literal>TRUNCATE
TABLE</literal> by deleting rows one by one if there are any
<literal>FOREIGN KEY</literal> constraints that reference the
- table. If there are no <literal>FOREIGN KEY</literal> constraints,
- <literal>InnoDB</literal> performs fast truncation by dropping
- the original table and creating an empty one with the same
- definition, which is much faster than deleting rows one by one.
- The <literal>AUTO_INCREMENT</literal> counter is reset by
- <literal>TRUNCATE TABLE</literal>, regardless of whether there
- is a <literal>FOREIGN KEY</literal> constraint.
+ table. If there are no <literal>FOREIGN KEY</literal>
+ constraints, <literal>InnoDB</literal> performs fast truncation
+ by dropping the original table and creating an empty one with
+ the same definition, which is much faster than deleting rows one
+ by one. The <literal>AUTO_INCREMENT</literal> counter is reset
+ by <literal>TRUNCATE TABLE</literal>, regardless of whether
+ there is a <literal>FOREIGN KEY</literal> constraint.
</para>
<para>
@@ -24092,15 +24092,16 @@
<para>
<literal>SHOW WARNINGS</literal> shows the error, warning, and
note messages that resulted from the last statement that
- generated messages, or nothing if the last statement that used
- a table generated no messages. A related statement,
- <literal>SHOW ERRORS</literal>, shows only the errors. See
- <xref linkend="show-errors"/>.
+ generated messages. It shows nothing if the last statement
+ used a table and generated no messages. (That is, a statement
+ that uses a table but generates no messages clears the message
+ list.) Statements that do not use tables and do not generate
+ messages have no effect on the message list.
</para>
<para>
- The list of messages is reset for each new statement that uses
- a table.
+ A related statement, <literal>SHOW ERRORS</literal>, shows
+ only the errors. See <xref linkend="show-errors"/>.
</para>
<para>
Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml 2008-04-15 20:21:57 UTC (rev 10492)
+++ trunk/refman-6.0/sql-syntax.xml 2008-04-15 21:25:56 UTC (rev 10493)
Changed blocks: 2, Lines Added: 14, Lines Deleted: 13; 2512 bytes
@@ -13762,13 +13762,13 @@
<literal>InnoDB</literal> processes <literal>TRUNCATE
TABLE</literal> by deleting rows one by one if there are any
<literal>FOREIGN KEY</literal> constraints that reference the
- table. If there are no <literal>FOREIGN KEY</literal> constraints,
- <literal>InnoDB</literal> performs fast truncation by dropping
- the original table and creating an empty one with the same
- definition, which is much faster than deleting rows one by one.
- The <literal>AUTO_INCREMENT</literal> counter is reset by
- <literal>TRUNCATE TABLE</literal>, regardless of whether there
- is a <literal>FOREIGN KEY</literal> constraint.
+ table. If there are no <literal>FOREIGN KEY</literal>
+ constraints, <literal>InnoDB</literal> performs fast truncation
+ by dropping the original table and creating an empty one with
+ the same definition, which is much faster than deleting rows one
+ by one. The <literal>AUTO_INCREMENT</literal> counter is reset
+ by <literal>TRUNCATE TABLE</literal>, regardless of whether
+ there is a <literal>FOREIGN KEY</literal> constraint.
</para>
<para>
@@ -24363,15 +24363,16 @@
<para>
<literal>SHOW WARNINGS</literal> shows the error, warning, and
note messages that resulted from the last statement that
- generated messages, or nothing if the last statement that used
- a table generated no messages. A related statement,
- <literal>SHOW ERRORS</literal>, shows only the errors. See
- <xref linkend="show-errors"/>.
+ generated messages. It shows nothing if the last statement
+ used a table and generated no messages. (That is, a statement
+ that uses a table but generates no messages clears the message
+ list.) Statements that do not use tables and do not generate
+ messages have no effect on the message list.
</para>
<para>
- The list of messages is reset for each new statement that uses
- a table.
+ A related statement, <literal>SHOW ERRORS</literal>, shows
+ only the errors. See <xref linkend="show-errors"/>.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10493 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 15 Apr |
