Author: paul
Date: 2009-08-07 18:59:24 +0200 (Fri, 07 Aug 2009)
New Revision: 16018
Log:
r43377@frost: paul | 2009-08-07 11:57:10 -0500
Update TRUNCATE TABLE to indicate current behavior within transactions or
while table lock is held
Modified:
trunk/refman-4.1/sql-syntax-data-manipulation.xml
trunk/refman-5.0/sql-syntax-data-manipulation.xml
trunk/refman-5.1/sql-syntax-data-manipulation.xml
trunk/refman-5.4/sql-syntax-data-manipulation.xml
trunk/refman-6.0/sql-syntax-data-manipulation.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:43365
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:43377
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/refman-4.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-manipulation.xml 2009-08-07 16:16:04 UTC (rev 16017)
+++ trunk/refman-4.1/sql-syntax-data-manipulation.xml 2009-08-07 16:59:24 UTC (rev 16018)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 3; 1115 bytes
@@ -6790,14 +6790,22 @@
<listitem>
<para>
- Truncate operations are not transaction-safe; an error occurs
- when attempting one in the course of an active transaction or
- active table lock.
+ As of MySQL 4.1.13, truncate operations cause an implicit
+ commit. Before 4.1.13, truncate operations are not
+ transaction-safe; an error occurs when attempting one in the
+ course of an active transaction.
</para>
</listitem>
<listitem>
<para>
+ Truncation operations cannot be performed if the session holds
+ an active table lock.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Truncation operations do not return the number of deleted
rows.
</para>
Modified: trunk/refman-5.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-manipulation.xml 2009-08-07 16:16:04 UTC (rev 16017)
+++ trunk/refman-5.0/sql-syntax-data-manipulation.xml 2009-08-07 16:59:24 UTC (rev 16018)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 3; 1113 bytes
@@ -7729,14 +7729,22 @@
<listitem>
<para>
- Truncate operations are not transaction-safe; an error occurs
- when attempting one in the course of an active transaction or
- active table lock.
+ As of MySQL 5.0.8, truncate operations cause an implicit
+ commit. Before 5.0.8, truncate operations are not
+ transaction-safe; an error occurs when attempting one in the
+ course of an active transaction.
</para>
</listitem>
<listitem>
<para>
+ Truncation operations cannot be performed if the session holds
+ an active table lock.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Truncation operations do not return the number of deleted
rows.
</para>
Modified: trunk/refman-5.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-manipulation.xml 2009-08-07 16:16:04 UTC (rev 16017)
+++ trunk/refman-5.1/sql-syntax-data-manipulation.xml 2009-08-07 16:59:24 UTC (rev 16018)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 3; 928 bytes
@@ -7972,14 +7972,19 @@
<listitem>
<para>
- Truncate operations are not transaction-safe; an error occurs
- when attempting one in the course of an active transaction or
- active table lock.
+ Truncate operations cause an implicit commit.
</para>
</listitem>
<listitem>
<para>
+ Truncation operations cannot be performed if the session holds
+ an active table lock.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Truncation operations do not return the number of deleted
rows.
</para>
Modified: trunk/refman-5.4/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-5.4/sql-syntax-data-manipulation.xml 2009-08-07 16:16:04 UTC (rev 16017)
+++ trunk/refman-5.4/sql-syntax-data-manipulation.xml 2009-08-07 16:59:24 UTC (rev 16018)
Changed blocks: 1, Lines Added: 11, Lines Deleted: 3; 1128 bytes
@@ -8583,14 +8583,22 @@
<listitem>
<para>
- Before MySQL 5.4.4, truncate operations are not
- transaction-safe; an error occurs when attempting one in the
- course of an active transaction or active table lock.
+ Truncate operations cause an implicit commit.
</para>
</listitem>
<listitem>
<para>
+ As of MySQL 5.4.4, truncation operations can be performed on
+ tables for which the session has acquired a
+ <literal>WRITE</literal> lock. Before 5.4.4, truncation
+ operations cannot be performed if the session holds an active
+ table lock.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Truncation operations do not return the number of deleted
rows.
</para>
Modified: trunk/refman-6.0/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-manipulation.xml 2009-08-07 16:16:04 UTC (rev 16017)
+++ trunk/refman-6.0/sql-syntax-data-manipulation.xml 2009-08-07 16:59:24 UTC (rev 16018)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 3; 928 bytes
@@ -8601,14 +8601,19 @@
<listitem>
<para>
- Truncate operations are not transaction-safe; an error occurs
- when attempting one in the course of an active transaction or
- active table lock.
+ Truncate operations cause an implicit commit.
</para>
</listitem>
<listitem>
<para>
+ Truncation operations cannot be performed if the session holds
+ an active table lock.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Truncation operations do not return the number of deleted
rows.
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r16018 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.4 refman-6.0 | paul.dubois | 7 Aug |
