List:Commits« Previous MessageNext Message »
From:paul Date:January 10 2007 2:17pm
Subject:svn commit - mysqldoc@docsrva: r4433 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2007-01-10 15:17:01 +0100 (Wed, 10 Jan 2007)
New Revision: 4433

Log:
 r17897@polar:  paul | 2007-01-10 08:13:30 -0600
 Some parser operations corrections from Marc. (WL#3565)


Modified:
   trunk/refman-4.1/language-structure.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:17878
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14282
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17897
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:14282
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:13015


Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml	2007-01-10 14:16:21 UTC (rev 4432)
+++ trunk/refman-4.1/language-structure.xml	2007-01-10 14:17:01 UTC (rev 4433)
Changed blocks: 3, Lines Added: 12, Lines Deleted: 16; 2241 bytes

@@ -1439,10 +1439,18 @@
       </para>
 
       <para>
-        For functions not listed in the array, whitespace does not
+        For functions not listed in the
+        <literal>sql_functions[]</literal>) array, whitespace does not
         matter. They are interpreted as function calls only when used in
         expression context and may be used freely as identifiers
-        otherwise. <literal>ASCII</literal> is one such name.
+        otherwise. <literal>ASCII</literal> is one such name. However,
+        for these non-affected function names, interpretation may vary
+        in expression context:
+        <literal><replaceable>func_name</replaceable> ()</literal> is
+        interpreted as a built-in function if there is one; if not,
+        <literal><replaceable>func_name</replaceable> ()</literal> is
+        interpreted as a user-defined function if one exists with that
+        name.
       </para>
 
       <para>

@@ -1479,18 +1487,6 @@
 CREATE TABLE `count`(i INT);
 CREATE TABLE `count` (i INT);
 </programlisting>
-
-          <para>
-            For non-affected function names (those not listed in
-            <literal>sql_functions[]</literal>), interpretation may vary
-            when there is whitespace following the function name in
-            expression context:
-            <literal><replaceable>func_name</replaceable> ()</literal>
-            is interpreted as a built-in function if there is one; if
-            not, <literal><replaceable>func_name</replaceable>
-            ()</literal> is interpreted as a user-defined function or
-            stored function if one exists with that name.
-          </para>
         </listitem>
 
         <listitem>

@@ -1573,8 +1569,8 @@
 
         <listitem>
           <para>
-            Avoid creating UDFs or stored functions that have the same
-            name as a built-in function.
+            Avoid creating UDFs that have the same name as a built-in
+            function.
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml	2007-01-10 14:16:21 UTC (rev 4432)
+++ trunk/refman-5.0/language-structure.xml	2007-01-10 14:17:01 UTC (rev 4433)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 14; 1959 bytes

@@ -1430,10 +1430,18 @@
       </para>
 
       <para>
-        For functions not listed in the array, whitespace does not
+        For functions not listed in the
+        <literal>sql_functions[]</literal>) array, whitespace does not
         matter. They are interpreted as function calls only when used in
         expression context and may be used freely as identifiers
-        otherwise. <literal>ASCII</literal> is one such name.
+        otherwise. <literal>ASCII</literal> is one such name. However,
+        for these non-affected function names, interpretation may vary
+        in expression context:
+        <literal><replaceable>func_name</replaceable> ()</literal> is
+        interpreted as a built-in function if there is one; if not,
+        <literal><replaceable>func_name</replaceable> ()</literal> is
+        interpreted as a user-defined function or stored function if one
+        exists with that name.
       </para>
 
       <para>

@@ -1470,18 +1478,6 @@
 CREATE TABLE `count`(i INT);
 CREATE TABLE `count` (i INT);
 </programlisting>
-
-          <para>
-            For non-affected function names (those not listed in
-            <literal>sql_functions[]</literal>), interpretation may vary
-            when there is whitespace following the function name in
-            expression context:
-            <literal><replaceable>func_name</replaceable> ()</literal>
-            is interpreted as a built-in function if there is one; if
-            not, <literal><replaceable>func_name</replaceable>
-            ()</literal> is interpreted as a user-defined function or
-            stored function if one exists with that name.
-          </para>
         </listitem>
 
         <listitem>


Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml	2007-01-10 14:16:21 UTC (rev 4432)
+++ trunk/refman-5.1/language-structure.xml	2007-01-10 14:17:01 UTC (rev 4433)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 14; 1959 bytes

@@ -1625,10 +1625,18 @@
       </para>
 
       <para>
-        For functions not listed in the array, whitespace does not
+        For functions not listed in the
+        <literal>sql_functions[]</literal>) array, whitespace does not
         matter. They are interpreted as function calls only when used in
         expression context and may be used freely as identifiers
-        otherwise. <literal>ASCII</literal> is one such name.
+        otherwise. <literal>ASCII</literal> is one such name. However,
+        for these non-affected function names, interpretation may vary
+        in expression context:
+        <literal><replaceable>func_name</replaceable> ()</literal> is
+        interpreted as a built-in function if there is one; if not,
+        <literal><replaceable>func_name</replaceable> ()</literal> is
+        interpreted as a user-defined function or stored function if one
+        exists with that name.
       </para>
 
       <para>

@@ -1665,18 +1673,6 @@
 CREATE TABLE `count`(i INT);
 CREATE TABLE `count` (i INT);
 </programlisting>
-
-          <para>
-            For non-affected function names (those not listed in
-            <literal>sql_functions[]</literal>), interpretation may vary
-            when there is whitespace following the function name in
-            expression context:
-            <literal><replaceable>func_name</replaceable> ()</literal>
-            is interpreted as a built-in function if there is one; if
-            not, <literal><replaceable>func_name</replaceable>
-            ()</literal> is interpreted as a user-defined function or
-            stored function if one exists with that name.
-          </para>
         </listitem>
 
         <listitem>


Thread
svn commit - mysqldoc@docsrva: r4433 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul10 Jan