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

[paul]

Author: paul
Date: 2006-12-05 15:51:41 +0100 (Tue, 05 Dec 2006)
New Revision: 4110

Log:
 r12611@kite-hub:  paul | 2006-12-05 08:50:06 -0600
 Move paragraph.


Modified:
   trunk/refman-5.0/stored-procedures.xml
   trunk/refman-5.1/stored-procedures.xml

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


Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml	2006-12-04 20:09:48 UTC (rev 4109)
+++ trunk/refman-5.0/stored-procedures.xml	2006-12-05 14:51:41 UTC (rev 4110)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 14; 1906 bytes

@@ -404,7 +404,15 @@
         a <literal>FUNCTION</literal>, for which it is mandatory. It
         indicates the return type of the function, and the function body
         must contain a <literal>RETURN
-        <replaceable>value</replaceable></literal> statement.
+        <replaceable>value</replaceable></literal> statement. If the
+        <literal>RETURN</literal> statement returns a value of a
+        different type, the value is coerced to the proper type. For
+        example, if a function specifies an <literal>ENUM</literal> or
+        <literal>SET</literal> value in the <literal>RETURNS</literal>
+        clause, but the <literal>RETURN</literal> statement returns an
+        integer, the value returned from the function is the string for
+        the corresponding <literal>ENUM</literal> member of set of
+        <literal>SET</literal> members.
       </para>
 
       <para>

@@ -751,19 +759,6 @@
 1 row in set (0.00 sec)
 </programlisting>
 
-      <para>
-        A stored function returns a value of the data type specified in
-        its <literal>RETURNS</literal> clause. If the
-        <literal>RETURN</literal> statement returns a value of a
-        different type, the value is coerced to the proper type. For
-        example, if a function returns an <literal>ENUM</literal> or
-        <literal>SET</literal> value, but the <literal>RETURN</literal>
-        statement returns an integer, the value returned from the
-        function is the string for the corresponding
-        <literal>ENUM</literal> member of set of <literal>SET</literal>
-        members.
-      </para>
-
     </section>
 
     <section id="alter-procedure">


Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml	2006-12-04 20:09:48 UTC (rev 4109)
+++ trunk/refman-5.1/stored-procedures.xml	2006-12-05 14:51:41 UTC (rev 4110)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 14; 1906 bytes

@@ -395,7 +395,15 @@
         a <literal>FUNCTION</literal>, for which it is mandatory. It
         indicates the return type of the function, and the function body
         must contain a <literal>RETURN
-        <replaceable>value</replaceable></literal> statement.
+        <replaceable>value</replaceable></literal> statement. If the
+        <literal>RETURN</literal> statement returns a value of a
+        different type, the value is coerced to the proper type. For
+        example, if a function specifies an <literal>ENUM</literal> or
+        <literal>SET</literal> value in the <literal>RETURNS</literal>
+        clause, but the <literal>RETURN</literal> statement returns an
+        integer, the value returned from the function is the string for
+        the corresponding <literal>ENUM</literal> member of set of
+        <literal>SET</literal> members.
       </para>
 
       <para>

@@ -723,19 +731,6 @@
 1 row in set (0.00 sec)
 </programlisting>
 
-      <para>
-        A stored function returns a value of the data type specified in
-        its <literal>RETURNS</literal> clause. If the
-        <literal>RETURN</literal> statement returns a value of a
-        different type, the value is coerced to the proper type. For
-        example, if a function returns an <literal>ENUM</literal> or
-        <literal>SET</literal> value, but the <literal>RETURN</literal>
-        statement returns an integer, the value returned from the
-        function is the string for the corresponding
-        <literal>ENUM</literal> member of set of <literal>SET</literal>
-        members.
-      </para>
-
     </section>
 
     <section id="alter-procedure">