Author: paul
Date: 2010-12-20 20:25:33 +0100 (Mon, 20 Dec 2010)
New Revision: 24514
Log:
r43327@dhcp-adc-twvpn-1-vpnpool-10-154-12-158: paul | 2010-12-20 13:24:16 -0500
Document bug fix:
- Bug#56571: DROP VIEW is not permitted if the view is locked by LOCK TABLE ... WRITE
Behavior change: CREATE/DROP VIEW prohibited while LOCK TABLES is in effect
Modified:
trunk/dynamic-docs/changelog/mysqld-2.xml
trunk/refman-4.1/sql-syntax-transactions.xml
trunk/refman-5.0/sql-syntax-transactions.xml
trunk/refman-5.1/sql-syntax-transactions.xml
trunk/refman-5.5/sql-syntax-transactions.xml
trunk/refman-5.6/sql-syntax-transactions.xml
trunk/refman-6.0/sql-syntax-transactions.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:45616
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:66486
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
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:43324
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:45616
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:66486
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
ebeeeee4-b232-4669-a521-231442eced53:/mysqldoc-local/mysqldoc/trunk:43327
Modified: trunk/dynamic-docs/changelog/mysqld-2.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-2.xml 2010-12-20 19:25:13 UTC (rev 24513)
+++ trunk/dynamic-docs/changelog/mysqld-2.xml 2010-12-20 19:25:33 UTC (rev 24514)
Changed blocks: 1, Lines Added: 30, Lines Deleted: 0; 937 bytes
@@ -35557,4 +35557,34 @@
</logentry>
+ <logentry entrytype="feature">
+
+ <tags>
+ <highlight type="incompatiblechange"/>
+ <manual type="CREATE VIEW"/>
+ <manual type="DROP VIEW"/>
+ <manual type="locking"/>
+ </tags>
+
+ <bugs>
+ <fixes bugid="56571"/>
+ </bugs>
+
+ <versions>
+ <version ver="5.5.3"/>
+ </versions>
+
+ <message>
+
+ <para>
+ <literal role="stmt">CREATE VIEW</literal> and
+ <literal role="stmt">DROP VIEW</literal> now are prohibited
+ while a <literal role="stmt">LOCK TABLES</literal> statement is
+ in effect.
+ </para>
+
+ </message>
+
+ </logentry>
+
</changelog>
Modified: trunk/refman-4.1/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-transactions.xml 2010-12-20 19:25:13 UTC (rev 24513)
+++ trunk/refman-4.1/sql-syntax-transactions.xml 2010-12-20 19:25:33 UTC (rev 24514)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 0; 701 bytes
@@ -602,6 +602,13 @@
</para>
<para>
+ For information about other conditions on the use of
+ <literal role="stmt">LOCK TABLES</literal> and statements that
+ cannot be used while <literal role="stmt">LOCK TABLES</literal> is
+ in effect, see <xref linkend="lock-tables-restrictions"/>
+ </para>
+
+ <para>
<emphasis role="bold">Rules for Lock Acquisition</emphasis>
</para>
Modified: trunk/refman-5.0/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-transactions.xml 2010-12-20 19:25:13 UTC (rev 24513)
+++ trunk/refman-5.0/sql-syntax-transactions.xml 2010-12-20 19:25:33 UTC (rev 24514)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 3; 1264 bytes
@@ -736,9 +736,10 @@
</para>
<para>
- <literal role="stmt">LOCK TABLES</literal> and
- <literal role="stmt" condition="lock-tables">UNLOCK
- TABLES</literal> cannot be used within stored programs.
+ For information about other conditions on the use of
+ <literal role="stmt">LOCK TABLES</literal> and statements that
+ cannot be used while <literal role="stmt">LOCK TABLES</literal> is
+ in effect, see <xref linkend="lock-tables-restrictions"/>
</para>
<para>
@@ -1315,6 +1316,12 @@
</para>
<para>
+ <literal role="stmt">LOCK TABLES</literal> and
+ <literal role="stmt" condition="lock-tables">UNLOCK
+ TABLES</literal> cannot be used within stored programs.
+ </para>
+
+ <para>
Normally, you do not need to lock tables, because all single
<literal role="stmt">UPDATE</literal> statements are atomic; no
other session can interfere with any other currently executing
Modified: trunk/refman-5.1/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-transactions.xml 2010-12-20 19:25:13 UTC (rev 24513)
+++ trunk/refman-5.1/sql-syntax-transactions.xml 2010-12-20 19:25:33 UTC (rev 24514)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 3; 1246 bytes
@@ -758,9 +758,10 @@
</para>
<para>
- <literal role="stmt">LOCK TABLES</literal> and
- <literal role="stmt" condition="lock-tables">UNLOCK
- TABLES</literal> cannot be used within stored programs.
+ For information about other conditions on the use of
+ <literal role="stmt">LOCK TABLES</literal> and statements that
+ cannot be used while <literal role="stmt">LOCK TABLES</literal> is
+ in effect, see <xref linkend="lock-tables-restrictions"/>
</para>
<para>
@@ -1331,6 +1332,12 @@
</para>
<para>
+ <literal role="stmt">LOCK TABLES</literal> and
+ <literal role="stmt" condition="lock-tables">UNLOCK
+ TABLES</literal> cannot be used within stored programs.
+ </para>
+
+ <para>
For some operations, system tables in the
<literal>mysql</literal> database must be accessed. For example,
the <literal role="stmt">HELP</literal> statement requires the
Modified: trunk/refman-5.5/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-transactions.xml 2010-12-20 19:25:13 UTC (rev 24513)
+++ trunk/refman-5.5/sql-syntax-transactions.xml 2010-12-20 19:25:33 UTC (rev 24514)
Changed blocks: 2, Lines Added: 36, Lines Deleted: 17; 2947 bytes
@@ -788,18 +788,13 @@
</para>
<para>
- <literal role="stmt">LOCK TABLES</literal> and
- <literal role="stmt" condition="lock-tables">UNLOCK
- TABLES</literal> cannot be used within stored programs.
+ For information about other conditions on the use of
+ <literal role="stmt">LOCK TABLES</literal> and statements that
+ cannot be used while <literal role="stmt">LOCK TABLES</literal> is
+ in effect, see <xref linkend="lock-tables-restrictions"/>
</para>
<para>
- Tables in the <literal>performance_schema</literal> database
- cannot be locked with <literal>LOCK TABLES</literal>, except the
- <literal>SETUP_<replaceable>xxx</replaceable></literal> tables.
- </para>
-
- <para>
<emphasis role="bold">Rules for Lock Acquisition</emphasis>
</para>
@@ -1367,20 +1362,44 @@
</para>
<para>
- As of MySQL 5.5.3, you cannot execute
- <literal role="stmt">CREATE TABLE</literal> or
- <literal role="stmt" condition="create-table">CREATE TABLE ...
- LIKE</literal> while a <literal role="stmt">LOCK
- TABLES</literal> statement is in effect.
+ <literal role="stmt">LOCK TABLES</literal> and
+ <literal role="stmt" condition="lock-tables">UNLOCK
+ TABLES</literal> cannot be used within stored programs.
</para>
<para>
- As of MySQL 5.5.8, DDL statements on events are prohibited while
- a <literal role="stmt">LOCK TABLES</literal> statement is in
- effect.
+ Tables in the <literal>performance_schema</literal> database
+ cannot be locked with <literal>LOCK TABLES</literal>, except the
+ <literal>SETUP_<replaceable>xxx</replaceable></literal> tables.
</para>
<para>
+ The following statements are prohibited while a
+ <literal role="stmt">LOCK TABLES</literal> statement is in
+ effect:
+ </para>
+
+ <itemizedlist>
+
+ <listitem>
+ <para>
+ As of MySQL 5.5.3, <literal role="stmt">CREATE
+ TABLE</literal>,
+ <literal role="stmt" condition="create-table">CREATE TABLE
+ ... LIKE</literal>, <literal role="stmt">CREATE
+ VIEW</literal>, and <literal role="stmt">DROP VIEW</literal>
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ As of MySQL 5.5.8, DDL statements on events
+ </para>
+ </listitem>
+
+ </itemizedlist>
+
+ <para>
For some operations, system tables in the
<literal>mysql</literal> database must be accessed. For example,
the <literal role="stmt">HELP</literal> statement requires the
Modified: trunk/refman-5.6/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-transactions.xml 2010-12-20 19:25:13 UTC (rev 24513)
+++ trunk/refman-5.6/sql-syntax-transactions.xml 2010-12-20 19:25:33 UTC (rev 24514)
Changed blocks: 2, Lines Added: 19, Lines Deleted: 15; 2369 bytes
@@ -788,18 +788,13 @@
</para>
<para>
- <literal role="stmt">LOCK TABLES</literal> and
- <literal role="stmt" condition="lock-tables">UNLOCK
- TABLES</literal> cannot be used within stored programs.
+ For information about other conditions on the use of
+ <literal role="stmt">LOCK TABLES</literal> and statements that
+ cannot be used while <literal role="stmt">LOCK TABLES</literal> is
+ in effect, see <xref linkend="lock-tables-restrictions"/>
</para>
<para>
- Tables in the <literal>performance_schema</literal> database
- cannot be locked with <literal>LOCK TABLES</literal>, except the
- <literal>SETUP_<replaceable>xxx</replaceable></literal> tables.
- </para>
-
- <para>
<emphasis role="bold">Rules for Lock Acquisition</emphasis>
</para>
@@ -1367,16 +1362,25 @@
</para>
<para>
- You cannot execute <literal role="stmt">CREATE TABLE</literal>
- or <literal role="stmt" condition="create-table">CREATE TABLE
- ... LIKE</literal> while a <literal role="stmt">LOCK
- TABLES</literal> statement is in effect.
+ <literal role="stmt">LOCK TABLES</literal> and
+ <literal role="stmt" condition="lock-tables">UNLOCK
+ TABLES</literal> cannot be used within stored programs.
</para>
<para>
- DDL statements on events are prohibited while a
+ Tables in the <literal>performance_schema</literal> database
+ cannot be locked with <literal>LOCK TABLES</literal>, except the
+ <literal>SETUP_<replaceable>xxx</replaceable></literal> tables.
+ </para>
+
+ <para>
+ The following statements are prohibited while a
<literal role="stmt">LOCK TABLES</literal> statement is in
- effect.
+ effect: <literal role="stmt">CREATE TABLE</literal>,
+ <literal role="stmt" condition="create-table">CREATE TABLE ...
+ LIKE</literal>, <literal role="stmt">CREATE VIEW</literal>,
+ <literal role="stmt">DROP VIEW</literal>, and DDL statements on
+ events.
</para>
<para>
Modified: trunk/refman-6.0/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-transactions.xml 2010-12-20 19:25:13 UTC (rev 24513)
+++ trunk/refman-6.0/sql-syntax-transactions.xml 2010-12-20 19:25:33 UTC (rev 24514)
Changed blocks: 2, Lines Added: 16, Lines Deleted: 9; 1788 bytes
@@ -837,18 +837,13 @@
</para>
<para>
- <literal role="stmt">LOCK TABLES</literal> and
- <literal role="stmt" condition="lock-tables">UNLOCK
- TABLES</literal> cannot be used within stored programs.
+ For information about other conditions on the use of
+ <literal role="stmt">LOCK TABLES</literal> and statements that
+ cannot be used while <literal role="stmt">LOCK TABLES</literal> is
+ in effect, see <xref linkend="lock-tables-restrictions"/>
</para>
<para>
- Tables in the <literal>performance_schema</literal> database
- cannot be locked with <literal>LOCK TABLES</literal>, except the
- <literal>SETUP_<replaceable>xxx</replaceable></literal> tables.
- </para>
-
- <para>
<emphasis role="bold">Rules for Lock Acquisition</emphasis>
</para>
@@ -1926,6 +1921,18 @@
</para>
<para>
+ <literal role="stmt">LOCK TABLES</literal> and
+ <literal role="stmt" condition="lock-tables">UNLOCK
+ TABLES</literal> cannot be used within stored programs.
+ </para>
+
+ <para>
+ Tables in the <literal>performance_schema</literal> database
+ cannot be locked with <literal>LOCK TABLES</literal>, except the
+ <literal>SETUP_<replaceable>xxx</replaceable></literal> tables.
+ </para>
+
+ <para>
Beginning with MySQL 6.0.14, you cannot execute
<literal role="stmt">CREATE TABLE</literal> or
<literal role="stmt" condition="create-table">CREATE TABLE ...
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r24514 - in trunk: . dynamic-docs/changelog refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 | paul.dubois | 20 Dec |
