svn commit - mysqldoc@docsrva: r7311 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.2

[paul]

Author: paul
Date: 2007-08-01 21:57:33 +0200 (Wed, 01 Aug 2007)
New Revision: 7311

Log:
 r28132@polar:  paul | 2007-08-01 14:29:20 -0500
 Restructure the description of function-creating methods. (Kent)


Modified:
   trunk/refman-4.1/extending-mysql.xml
   trunk/refman-5.0/extending-mysql.xml
   trunk/refman-5.1/extending-mysql.xml
   trunk/refman-5.2/extending-mysql.xml

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


Modified: trunk/refman-4.1/extending-mysql.xml
===================================================================
--- trunk/refman-4.1/extending-mysql.xml	2007-08-01 19:57:20 UTC (rev 7310)
+++ trunk/refman-4.1/extending-mysql.xml	2007-08-01 19:57:33 UTC (rev 7311)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 487 bytes

@@ -320,7 +320,8 @@
     </itemizedlist>
 
     <para>
-      Each method has advantages and disadvantages:
+      Each method of creating compiled functions has advantages and
+      disadvantages:
     </para>
 
     <itemizedlist>


Modified: trunk/refman-5.0/extending-mysql.xml
===================================================================
--- trunk/refman-5.0/extending-mysql.xml	2007-08-01 19:57:20 UTC (rev 7310)
+++ trunk/refman-5.0/extending-mysql.xml	2007-08-01 19:57:33 UTC (rev 7311)
Changed blocks: 3, Lines Added: 12, Lines Deleted: 9; 1586 bytes

@@ -280,7 +280,7 @@
     <remark role="help-category" condition="Functions"/>
 
     <para>
-      There are two ways to add new functions to MySQL:
+      There are three ways to add new functions to MySQL:
     </para>
 
     <itemizedlist>

@@ -305,10 +305,20 @@
         </para>
       </listitem>
 
+      <listitem>
+        <para>
+          Another way to add functions is by creating stored functions.
+          These are written using SQL statements rather than by
+          compiling object code. The syntax for writing stored functions
+          is not covered here. See <xref linkend="stored-procedures"/>.
+        </para>
+      </listitem>
+
     </itemizedlist>
 
     <para>
-      Each method has advantages and disadvantages:
+      Each method of creating compiled functions has advantages and
+      disadvantages:
     </para>
 
     <itemizedlist>

@@ -348,13 +358,6 @@
     </para>
 
     <para>
-      Another way to add functions is by creating stored functions.
-      These are written using SQL statements rather than by compiling
-      object code. The syntax for writing stored functions is described
-      in <xref linkend="stored-procedures"/>.
-    </para>
-
-    <para>
       See <xref linkend="function-resolution"/>, for the rules
       describing how the server interprets references to different kinds
       of functions.


Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml	2007-08-01 19:57:20 UTC (rev 7310)
+++ trunk/refman-5.1/extending-mysql.xml	2007-08-01 19:57:33 UTC (rev 7311)
Changed blocks: 3, Lines Added: 12, Lines Deleted: 9; 1592 bytes

@@ -2595,7 +2595,7 @@
     <remark role="help-category" condition="Functions"/>
 
     <para>
-      There are two ways to add new functions to MySQL:
+      There are three ways to add new functions to MySQL:
     </para>
 
     <itemizedlist>

@@ -2620,10 +2620,20 @@
         </para>
       </listitem>
 
+      <listitem>
+        <para>
+          Another way to add functions is by creating stored functions.
+          These are written using SQL statements rather than by
+          compiling object code. The syntax for writing stored functions
+          is not covered here. See <xref linkend="stored-procedures"/>.
+        </para>
+      </listitem>
+
     </itemizedlist>
 
     <para>
-      Each method has advantages and disadvantages:
+      Each method of creating compiled functions has advantages and
+      disadvantages:
     </para>
 
     <itemizedlist>

@@ -2663,13 +2673,6 @@
     </para>
 
     <para>
-      Another way to add functions is by creating stored functions.
-      These are written using SQL statements rather than by compiling
-      object code. The syntax for writing stored functions is described
-      in <xref linkend="stored-procedures"/>.
-    </para>
-
-    <para>
       See <xref linkend="function-resolution"/>, for the rules
       describing how the server interprets references to different kinds
       of functions.


Modified: trunk/refman-5.2/extending-mysql.xml
===================================================================
--- trunk/refman-5.2/extending-mysql.xml	2007-08-01 19:57:20 UTC (rev 7310)
+++ trunk/refman-5.2/extending-mysql.xml	2007-08-01 19:57:33 UTC (rev 7311)
Changed blocks: 3, Lines Added: 12, Lines Deleted: 9; 1592 bytes

@@ -2595,7 +2595,7 @@
     <remark role="help-category" condition="Functions"/>
 
     <para>
-      There are two ways to add new functions to MySQL:
+      There are three ways to add new functions to MySQL:
     </para>
 
     <itemizedlist>

@@ -2620,10 +2620,20 @@
         </para>
       </listitem>
 
+      <listitem>
+        <para>
+          Another way to add functions is by creating stored functions.
+          These are written using SQL statements rather than by
+          compiling object code. The syntax for writing stored functions
+          is not covered here. See <xref linkend="stored-procedures"/>.
+        </para>
+      </listitem>
+
     </itemizedlist>
 
     <para>
-      Each method has advantages and disadvantages:
+      Each method of creating compiled functions has advantages and
+      disadvantages:
     </para>
 
     <itemizedlist>

@@ -2663,13 +2673,6 @@
     </para>
 
     <para>
-      Another way to add functions is by creating stored functions.
-      These are written using SQL statements rather than by compiling
-      object code. The syntax for writing stored functions is described
-      in <xref linkend="stored-procedures"/>.
-    </para>
-
-    <para>
       See <xref linkend="function-resolution"/>, for the rules
       describing how the server interprets references to different kinds
       of functions.