svn commit - mysqldoc@docsrva: r1424 - in trunk: . refman-5.0 refman-5.1 refman-common

[paul]

Author: paul
Date: 2006-02-22 17:18:05 +0100 (Wed, 22 Feb 2006)
New Revision: 1424

Log:
 r8037@frost:  paul | 2006-02-22 10:16:45 -0600
 Stored functions/triggers cannot modify a table that is being
 read/written by the invoking statement.


Modified:
   trunk/
   trunk/refman-5.0/restrictions.xml
   trunk/refman-5.1/restrictions.xml
   trunk/refman-common/news-5.0.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8016
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3504
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8037
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3504

Modified: trunk/refman-5.0/restrictions.xml
===================================================================
--- trunk/refman-5.0/restrictions.xml	2006-02-22 13:43:17 UTC (rev 1423)
+++ trunk/refman-5.0/restrictions.xml	2006-02-22 16:18:05 UTC (rev 1424)
@@ -99,7 +99,7 @@
 
     <para>
       For stored functions (but not stored procedures), the following
-      additional statements are disallowed:
+      additional statements or operations are disallowed:
     </para>
 
     <itemizedlist>
@@ -150,6 +150,15 @@
         </para>
       </listitem>
 
+      <listitem>
+        <para>
+          Within a stored function or trigger, it is not allowable to
+          modify a table that is already being used (for reading or
+          writing) by the statement that invoked the function or
+          trigger.
+        </para>
+      </listitem>
+
     </itemizedlist>
 
     <para>

Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml	2006-02-22 13:43:17 UTC (rev 1423)
+++ trunk/refman-5.1/restrictions.xml	2006-02-22 16:18:05 UTC (rev 1424)
@@ -90,7 +90,7 @@
 
     <para>
       For stored functions (but not stored procedures), the following
-      additional statements are disallowed:
+      additional statements or operations are disallowed:
     </para>
 
     <itemizedlist>
@@ -127,6 +127,15 @@
         </para>
       </listitem>
 
+      <listitem>
+        <para>
+          Within a stored function or trigger, it is not allowable to
+          modify a table that is already being used (for reading or
+          writing) by the statement that invoked the function or
+          trigger.
+        </para>
+      </listitem>
+
     </itemizedlist>
 
     <para>

Modified: trunk/refman-common/news-5.0.xml
===================================================================
--- trunk/refman-common/news-5.0.xml	2006-02-22 13:43:17 UTC (rev 1423)
+++ trunk/refman-common/news-5.0.xml	2006-02-22 16:18:05 UTC (rev 1424)
@@ -41,8 +41,8 @@
 
     <listitem>
       <para>
-        Basic support for stored procedures (SQL:2003 style). See
-        <xref linkend="stored-procedures"/>.
+        Basic support for stored procedures and functions (SQL:2003
+        style). See <xref linkend="stored-procedures"/>.
       </para>
     </listitem>
 
@@ -674,7 +674,7 @@
         <para>
           The <command>mysqlbinlog</command> utility did not output
           <literal>DELIMITER</literal> statements, causing syntax errors
-          for stored procedure creation statements. (Bug #11312)
+          for stored routine creation statements. (Bug #11312)
         </para>
       </listitem>
 
@@ -4642,6 +4642,16 @@
 
       <listitem>
         <para>
+          Recursive triggers are detected and disallowed. Also, within a
+          stored function or trigger, it is not allowable to modify a
+          table that is already being used (for reading or writing) by
+          the statement that invoked the function or trigger. (Bug
+          #11896, Bug #12644)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           <literal>SHOW TABLE STATUS</literal> for a view now shows
           <literal>VIEW</literal> in uppercase, consistent with
           <literal>SHOW TABLES</literal> and
@@ -4700,13 +4710,6 @@
 
       <listitem>
         <para>
-          Recursive triggers are detected and disallowed. (Bug #11896,
-          Bug #12644)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
           <literal>SHOW OPEN TABLES</literal> now supports
           <literal>FROM</literal> and <literal>LIKE</literal>
clauses.
           (Bug #12183)