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

[paul]

Author: paul
Date: 2006-12-11 16:13:33 +0100 (Mon, 11 Dec 2006)
New Revision: 4205

Log:
 r13416@frost:  paul | 2006-12-11 09:12:51 -0600
 Function name resolution: Add clarification suggested by Marc.


Modified:
   trunk/refman-5.0/installing-cs.xml
   trunk/refman-5.0/language-structure.xml
   trunk/refman-5.1/language-structure.xml

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


Modified: trunk/refman-5.0/installing-cs.xml
===================================================================
--- trunk/refman-5.0/installing-cs.xml	2006-12-11 14:13:14 UTC (rev 4204)
+++ trunk/refman-5.0/installing-cs.xml	2006-12-11 15:13:33 UTC (rev 4205)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 6; 1509 bytes

@@ -11164,12 +11164,16 @@
           inaccessible. To correct this, use <literal>DROP
           FUNCTION</literal> to drop the UDF, and then use
           <literal>CREATE FUNCTION</literal> to re-create the UDF with a
-          different non-conflicting name. The same is true if the new
-          version of MySQL implements a built-in function with the same
-          name as an existing stored function. See
-          <xref linkend="function-resolution"/>, for the rules
-          describing how the server interprets references to different
-          kinds of functions.
+          different non-conflicting name. If a new version of MySQL
+          implements a built-in function with the same name as an
+          existing stored function, you have two choices: Rename the
+          stored function to use a non-conflicting name, or change calls
+          to the function so that they use a database qualifier (that
+          is, use
+         
<literal><replaceable>db_name</replaceable>.<replaceable>func_name</replaceable>()</literal>
+          syntax). See <xref linkend="function-resolution"/>, for the
+          rules describing how the server interprets references to
+          different kinds of functions.
         </para>
       </listitem>
 


Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml	2006-12-11 14:13:14 UTC (rev 4204)
+++ trunk/refman-5.0/language-structure.xml	2006-12-11 15:13:33 UTC (rev 4205)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 3; 1144 bytes

@@ -1399,9 +1399,13 @@
         inaccessible. To correct this, use <literal>DROP
         FUNCTION</literal> to drop the UDF, and then use <literal>CREATE
         FUNCTION</literal> to re-create the UDF with a different
-        non-conflicting name. The same is true if the new version of
-        MySQL implements a built-in function with the same name as an
-        existing stored function.
+        non-conflicting name. If a new version of MySQL implements a
+        built-in function with the same name as an existing stored
+        function, you have two choices: Rename the stored function to
+        use a non-conflicting name, or change calls to the function so
+        that they use a database qualifier (that is, use
+       
<literal><replaceable>db_name</replaceable>.<replaceable>func_name</replaceable>()</literal>
+        syntax).
       </para>
 
     </section>


Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml	2006-12-11 14:13:14 UTC (rev 4204)
+++ trunk/refman-5.1/language-structure.xml	2006-12-11 15:13:33 UTC (rev 4205)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 3; 1144 bytes

@@ -1599,9 +1599,13 @@
         inaccessible. To correct this, use <literal>DROP
         FUNCTION</literal> to drop the UDF, and then use <literal>CREATE
         FUNCTION</literal> to re-create the UDF with a different
-        non-conflicting name. The same is true if the new version of
-        MySQL implements a built-in function with the same name as an
-        existing stored function.
+        non-conflicting name. If a new version of MySQL implements a
+        built-in function with the same name as an existing stored
+        function, you have two choices: Rename the stored function to
+        use a non-conflicting name, or change calls to the function so
+        that they use a database qualifier (that is, use
+       
<literal><replaceable>db_name</replaceable>.<replaceable>func_name</replaceable>()</literal>
+        syntax).
       </para>
 
     </section>