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

[paul]

Author: paul
Date: 2006-11-30 20:39:25 +0100 (Thu, 30 Nov 2006)
New Revision: 4086

Log:
 r16501@polar:  paul | 2006-11-30 13:36:16 -0600
 Document IF EXISTS clause for DROP TRIGGER. (Bug#23703)


Modified:
   trunk/refman-5.0/releasenotes-es-5.0.xml
   trunk/refman-5.0/triggers.xml
   trunk/refman-5.1/news-5.1.xml
   trunk/refman-5.1/triggers.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:16467
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:12842
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:12361
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:16501
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:12842
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:12361


Modified: trunk/refman-5.0/releasenotes-es-5.0.xml
===================================================================
--- trunk/refman-5.0/releasenotes-es-5.0.xml	2006-11-30 17:47:09 UTC (rev 4085)
+++ trunk/refman-5.0/releasenotes-es-5.0.xml	2006-11-30 19:39:25 UTC (rev 4086)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 9; 1411 bytes

@@ -40,20 +40,20 @@
       applied since the last MySQL Enterprise Server release (5.0.30).
     </para>
 
-<!--
     <para>
       Functionality added or changed:
     </para>
 
     <itemizedlist>
-      
+
       <listitem>
         <para>
+          <literal>DROP TRIGGER</literal> now supports an <literal>IF
+          EXISTS</literal> clause. (Bug #23703)
         </para>
       </listitem>
 
     </itemizedlist>
--->
 
     <para>
       Bugs fixed:

@@ -325,14 +325,13 @@
     </para>
 
     <itemizedlist>
-      
+
       <listitem>
         <para>
-          A stored procedure, executed from a connection using a
-          binary character set, and which wrote multibyte data,
-          would write incorrectly escaped entries to the binary log.
-          This caused syntax errors, and caused replication to fail.
-          (Bug #23619) 
+          A stored procedure, executed from a connection using a binary
+          character set, and which wrote multi-byte data, would write
+          incorrectly escaped entries to the binary log. This caused
+          syntax errors, and caused replication to fail. (Bug #23619)
         </para>
       </listitem>
 


Modified: trunk/refman-5.0/triggers.xml
===================================================================
--- trunk/refman-5.0/triggers.xml	2006-11-30 17:47:09 UTC (rev 4085)
+++ trunk/refman-5.0/triggers.xml	2006-11-30 19:39:25 UTC (rev 4086)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 5; 1302 bytes

@@ -509,10 +509,6 @@
       <primary>trigger, dropping</primary>
     </indexterm>
 
-    <remark>
-      There is no IF EXISTS clause, apparently.
-    </remark>
-
     <remark role="help-topic" condition="DROP TRIGGER"/>
 
     <remark role="help-keywords">

@@ -522,7 +518,7 @@
     <remark role="help-syntax"/>
 
 <programlisting>
-DROP TRIGGER
[<replaceable>schema_name</replaceable>.]<replaceable>trigger_name</replaceable>
+DROP TRIGGER [IF EXISTS]
[<replaceable>schema_name</replaceable>.]<replaceable>trigger_name</replaceable>
 </programlisting>
 
     <remark role="help-description-begin"/>

@@ -535,6 +531,15 @@
       privilege.
     </para>
 
+    <para>
+      Use <literal>IF EXISTS</literal> to prevent an error from
+      occurring for a trigger that does not exist. A
+      <literal>NOTE</literal> is generated for a non-existent trigger
+      when using <literal>IF EXISTS</literal>. See
+      <xref linkend="show-warnings"/>. The <literal>IF EXISTS</literal>
+      clause was added in MySQL 5.0.32.
+    </para>
+
     <remark role="help-description-end"/>
 
     <para>


Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml	2006-11-30 17:47:09 UTC (rev 4085)
+++ trunk/refman-5.1/news-5.1.xml	2006-11-30 19:39:25 UTC (rev 4086)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 16; 1448 bytes

@@ -82,33 +82,33 @@
       changes to report.
     </remark>
 
-<!--
-  <para>
-    Functionality added or changed:
-  </para>
+    <para>
+      Functionality added or changed:
+    </para>
 
-  <itemizedlist>
+    <itemizedlist>
 
-    <listitem>
-      <para></para>
-    </listitem>
+      <listitem>
+        <para>
+          <literal>DROP TRIGGER</literal> now supports an <literal>IF
+          EXISTS</literal> clause. (Bug #23703)
+        </para>
+      </listitem>
 
-  </itemizedlist>
--->
+    </itemizedlist>
 
     <para>
       Bugs fixed:
     </para>
 
     <itemizedlist>
-      
+
       <listitem>
         <para>
-          A stored procedure, executed from a connection using a
-          binary character set, and which wrote multi-byte data,
-          would write incorrectly escaped entries to the binary log.
-          This caused syntax errors, and caused replication to fail.
-          (Bug #23619) 
+          A stored procedure, executed from a connection using a binary
+          character set, and which wrote multi-byte data, would write
+          incorrectly escaped entries to the binary log. This caused
+          syntax errors, and caused replication to fail. (Bug #23619)
         </para>
       </listitem>
 


Modified: trunk/refman-5.1/triggers.xml
===================================================================
--- trunk/refman-5.1/triggers.xml	2006-11-30 17:47:09 UTC (rev 4085)
+++ trunk/refman-5.1/triggers.xml	2006-11-30 19:39:25 UTC (rev 4086)
Changed blocks: 4, Lines Added: 11, Lines Deleted: 6; 1568 bytes

@@ -48,7 +48,7 @@
     logging as it applies to triggers are given in
     <xref linkend="stored-procedure-logging"/>.
   </para>
-  
+
   <para>
     For answers to some common questions about triggers in MySQL
     &current-series;, see <xref linkend="faqs-triggers"/>.

@@ -475,10 +475,6 @@
       <primary>trigger, dropping</primary>
     </indexterm>
 
-    <remark>
-      There is no IF EXISTS clause, apparently.
-    </remark>
-
     <remark role="help-topic" condition="DROP TRIGGER"/>
 
     <remark role="help-keywords">

@@ -488,7 +484,7 @@
     <remark role="help-syntax"/>
 
 <programlisting>
-DROP TRIGGER
[<replaceable>schema_name</replaceable>.]<replaceable>trigger_name</replaceable>
+DROP TRIGGER [IF EXISTS]
[<replaceable>schema_name</replaceable>.]<replaceable>trigger_name</replaceable>
 </programlisting>
 
     <remark role="help-description-begin"/>

@@ -503,6 +499,15 @@
       MySQL 5.1.6.)
     </para>
 
+    <para>
+      Use <literal>IF EXISTS</literal> to prevent an error from
+      occurring for a trigger that does not exist. A
+      <literal>NOTE</literal> is generated for a non-existent trigger
+      when using <literal>IF EXISTS</literal>. See
+      <xref linkend="show-warnings"/>. The <literal>IF EXISTS</literal>
+      clause was added in MySQL 5.1.14.
+    </para>
+
     <remark role="help-description-end"/>
 
     <para>