List:Commits« Previous MessageNext Message »
From:paul Date:January 9 2008 7:15pm
Subject:svn commit - mysqldoc@docsrva: r9537 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0
View as plain text  
Author: paul
Date: 2008-01-09 20:15:12 +0100 (Wed, 09 Jan 2008)
New Revision: 9537

Log:
 r34800@arctic:  paul | 2008-01-09 13:08:36 -0600
 Add markup


Modified:
   trunk/refman-4.1/errors-problems.xml
   trunk/refman-4.1/functions-core.xml
   trunk/refman-4.1/news-3.23.xml
   trunk/refman-4.1/restrictions.xml
   trunk/refman-5.0/errors-problems.xml
   trunk/refman-5.0/functions-core.xml
   trunk/refman-5.1/errors-problems-core.xml
   trunk/refman-5.1/functions-core.xml
   trunk/refman-5.1/partitioning-guide.xml
   trunk/refman-5.1/partitioning.xml
   trunk/refman-6.0/errors-problems.xml
   trunk/refman-6.0/functions-core.xml
   trunk/refman-6.0/partitioning-guide.xml
   trunk/refman-6.0/partitioning.xml

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


Modified: trunk/refman-4.1/errors-problems.xml
===================================================================
--- trunk/refman-4.1/errors-problems.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-4.1/errors-problems.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 667 bytes

@@ -5568,7 +5568,7 @@
             <para>
               You can't use <quote><literal>_</literal></quote> or
               <quote><literal>%</literal></quote> with
-              <literal>ESCAPE</literal> in <function role="sqlop">LIKE ...
+              <literal>ESCAPE</literal> in <function role="sqlop" condition="like">LIKE ...
               ESCAPE</function>.
             </para>
           </listitem>


Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-4.1/functions-core.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 18, Lines Added: 18, Lines Deleted: 18; 6730 bytes

@@ -1985,7 +1985,7 @@
             <primary>NULLIF()</primary>
           </indexterm>
 
-          <literal>NULLIF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</literal>
+          <function role="sql">NULLIF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -2982,7 +2982,7 @@
             <primary>LOWER()</primary>
           </indexterm>
 
-          <literal>LOWER(<replaceable>str</replaceable>)</literal>
+          <function role="sql">LOWER(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3020,7 +3020,7 @@
             <primary>LPAD()</primary>
           </indexterm>
 
-          <literal>LPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</literal>
+          <function role="sql">LPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</function>
         </para>
 
         <para>

@@ -3058,7 +3058,7 @@
             <primary>LTRIM()</primary>
           </indexterm>
 
-          <literal>LTRIM(<replaceable>str</replaceable>)</literal>
+          <function role="sql">LTRIM(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3094,7 +3094,7 @@
             <primary>MAKE_SET()</primary>
           </indexterm>
 
-          <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
+          <function role="sql">MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3140,7 +3140,7 @@
             <primary>MID()</primary>
           </indexterm>
 
-          <literal>MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>
+          <function role="sql">MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3148,7 +3148,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          <literal>MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>
+          <function role="sql">MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</function>
           is a synonym for
           <literal>SUBSTRING(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>.
         </para>

@@ -3166,7 +3166,7 @@
             <primary>OCTET_LENGTH()</primary>
           </indexterm>
 
-          <literal>OCTET_LENGTH(<replaceable>str</replaceable>)</literal>
+          <function role="sql">OCTET_LENGTH(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3191,7 +3191,7 @@
             <primary>ORD()</primary>
           </indexterm>
 
-          <literal>ORD(<replaceable>str</replaceable>)</literal>
+          <function role="sql">ORD(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -6574,7 +6574,7 @@
               <primary>OCT()</primary>
             </indexterm>
 
-            <literal>OCT(<replaceable>N</replaceable>)</literal>
+            <function role="sql">OCT(<replaceable>N</replaceable>)</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -8853,7 +8853,7 @@
             <primary>MAKEDATE()</primary>
           </indexterm>
 
-          <literal>MAKEDATE(<replaceable>year</replaceable>,<replaceable>dayofyear</replaceable>)</literal>
+          <function role="sql">MAKEDATE(<replaceable>year</replaceable>,<replaceable>dayofyear</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -8895,7 +8895,7 @@
             <primary>MAKETIME()</primary>
           </indexterm>
 
-          <literal>MAKETIME(<replaceable>hour</replaceable>,<replaceable>minute</replaceable>,<replaceable>second</replaceable>)</literal>
+          <function role="sql">MAKETIME(<replaceable>hour</replaceable>,<replaceable>minute</replaceable>,<replaceable>second</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -8934,7 +8934,7 @@
             <primary>MICROSECOND()</primary>
           </indexterm>
 
-          <literal>MICROSECOND(<replaceable>expr</replaceable>)</literal>
+          <function role="sql">MICROSECOND(<replaceable>expr</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -8974,7 +8974,7 @@
             <primary>MINUTE()</primary>
           </indexterm>
 
-          <literal>MINUTE(<replaceable>time</replaceable>)</literal>
+          <function role="sql">MINUTE(<replaceable>time</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9006,7 +9006,7 @@
             <primary>MONTH()</primary>
           </indexterm>
 
-          <literal>MONTH(<replaceable>date</replaceable>)</literal>
+          <function role="sql">MONTH(<replaceable>date</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9041,7 +9041,7 @@
             <primary>MONTHNAME()</primary>
           </indexterm>
 
-          <literal>MONTHNAME(<replaceable>date</replaceable>)</literal>
+          <function role="sql">MONTHNAME(<replaceable>date</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -15553,7 +15553,7 @@
               <primary>MASTER_POS_WAIT()</primary>
             </indexterm>
 
-            <literal>MASTER_POS_WAIT(<replaceable>log_name</replaceable>,<replaceable>log_pos</replaceable>[,<replaceable>timeout</replaceable>])</literal>
+            <function role="sql">MASTER_POS_WAIT(<replaceable>log_name</replaceable>,<replaceable>log_pos</replaceable>[,<replaceable>timeout</replaceable>])</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -16244,7 +16244,7 @@
             when it comes to using <literal>DISTINCT</literal> together
             with <literal>ORDER BY</literal>. To work around this
             limitation, use
-            <literal>MID(<replaceable>expr</replaceable>,1,255)</literal>
+            <function role="sql">MID(<replaceable>expr</replaceable>,1,255)</function>
             instead.
           </para>
 


Modified: trunk/refman-4.1/news-3.23.xml
===================================================================
--- trunk/refman-4.1/news-3.23.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-4.1/news-3.23.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 1112 bytes

@@ -7416,7 +7416,7 @@
       <listitem>
         <para>
           Fixed problem with <literal>BLOB NULL</literal> keys and
-          <function role="sql" condition="like">LIKE "prefix%"</function>.
+          <function role="sqlop" condition="like">LIKE "prefix%"</function>.
         </para>
       </listitem>
 

@@ -7757,7 +7757,7 @@
 
       <listitem>
         <para>
-          Added function <literal>ORD(string)</literal>.
+          Added function <function role="sql">ORD(string)</function>.
         </para>
       </listitem>
 

@@ -7964,7 +7964,7 @@
 
       <listitem>
         <para>
-          Fixed problem with <function role="sql" condition="like">LIKE "%"</function> on an index
+          Fixed problem with <function role="sqlop" condition="like">LIKE "%"</function> on an index
           that may have <literal>NULL</literal> values.
         </para>
       </listitem>


Modified: trunk/refman-4.1/restrictions.xml
===================================================================
--- trunk/refman-4.1/restrictions.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-4.1/restrictions.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 4; 764 bytes

@@ -774,10 +774,7 @@
         <listitem>
           <para>
             The timers within MySQL used on Windows are of a lower
-            precision than the timers used on Linux. For most situations
-            you may not notice a difference, but the delay implied by a
-            call to <function role="sql">SLEEP()</function> on Windows and Linux may
-            differ slightly due to the differences in precision.
+            precision than the timers used on Linux.
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-5.0/errors-problems.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 667 bytes

@@ -5306,7 +5306,7 @@
             <para>
               You can't use <quote><literal>_</literal></quote> or
               <quote><literal>%</literal></quote> with
-              <literal>ESCAPE</literal> in <function role="sqlop">LIKE ...
+              <literal>ESCAPE</literal> in <function role="sqlop" condition="like">LIKE ...
               ESCAPE</function>.
             </para>
           </listitem>


Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-5.0/functions-core.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 18, Lines Added: 18, Lines Deleted: 18; 6714 bytes

@@ -2101,7 +2101,7 @@
             <primary>NULLIF()</primary>
           </indexterm>
 
-          <literal>NULLIF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</literal>
+          <function role="sql">NULLIF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3125,7 +3125,7 @@
             <primary>LOWER()</primary>
           </indexterm>
 
-          <literal>LOWER(<replaceable>str</replaceable>)</literal>
+          <function role="sql">LOWER(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3163,7 +3163,7 @@
             <primary>LPAD()</primary>
           </indexterm>
 
-          <literal>LPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</literal>
+          <function role="sql">LPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</function>
         </para>
 
         <para>

@@ -3201,7 +3201,7 @@
             <primary>LTRIM()</primary>
           </indexterm>
 
-          <literal>LTRIM(<replaceable>str</replaceable>)</literal>
+          <function role="sql">LTRIM(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3237,7 +3237,7 @@
             <primary>MAKE_SET()</primary>
           </indexterm>
 
-          <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
+          <function role="sql">MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3283,7 +3283,7 @@
             <primary>MID()</primary>
           </indexterm>
 
-          <literal>MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>
+          <function role="sql">MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3291,7 +3291,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          <literal>MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>
+          <function role="sql">MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</function>
           is a synonym for
           <literal>SUBSTRING(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>.
         </para>

@@ -3309,7 +3309,7 @@
             <primary>OCT()</primary>
           </indexterm>
 
-          <literal>OCT(<replaceable>N</replaceable>)</literal>
+          <function role="sql">OCT(<replaceable>N</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3346,7 +3346,7 @@
             <primary>OCTET_LENGTH()</primary>
           </indexterm>
 
-          <literal>OCTET_LENGTH(<replaceable>str</replaceable>)</literal>
+          <function role="sql">OCTET_LENGTH(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3371,7 +3371,7 @@
             <primary>ORD()</primary>
           </indexterm>
 
-          <literal>ORD(<replaceable>str</replaceable>)</literal>
+          <function role="sql">ORD(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9012,7 +9012,7 @@
             <primary>MAKEDATE()</primary>
           </indexterm>
 
-          <literal>MAKEDATE(<replaceable>year</replaceable>,<replaceable>dayofyear</replaceable>)</literal>
+          <function role="sql">MAKEDATE(<replaceable>year</replaceable>,<replaceable>dayofyear</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9049,7 +9049,7 @@
             <primary>MAKETIME()</primary>
           </indexterm>
 
-          <literal>MAKETIME(<replaceable>hour</replaceable>,<replaceable>minute</replaceable>,<replaceable>second</replaceable>)</literal>
+          <function role="sql">MAKETIME(<replaceable>hour</replaceable>,<replaceable>minute</replaceable>,<replaceable>second</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9083,7 +9083,7 @@
             <primary>MICROSECOND()</primary>
           </indexterm>
 
-          <literal>MICROSECOND(<replaceable>expr</replaceable>)</literal>
+          <function role="sql">MICROSECOND(<replaceable>expr</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9118,7 +9118,7 @@
             <primary>MINUTE()</primary>
           </indexterm>
 
-          <literal>MINUTE(<replaceable>time</replaceable>)</literal>
+          <function role="sql">MINUTE(<replaceable>time</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9150,7 +9150,7 @@
             <primary>MONTH()</primary>
           </indexterm>
 
-          <literal>MONTH(<replaceable>date</replaceable>)</literal>
+          <function role="sql">MONTH(<replaceable>date</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9185,7 +9185,7 @@
             <primary>MONTHNAME()</primary>
           </indexterm>
 
-          <literal>MONTHNAME(<replaceable>date</replaceable>)</literal>
+          <function role="sql">MONTHNAME(<replaceable>date</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -15739,7 +15739,7 @@
               <primary>MASTER_POS_WAIT()</primary>
             </indexterm>
 
-            <literal>MASTER_POS_WAIT(<replaceable>log_name</replaceable>,<replaceable>log_pos</replaceable>[,<replaceable>timeout</replaceable>])</literal>
+            <function role="sql">MASTER_POS_WAIT(<replaceable>log_name</replaceable>,<replaceable>log_pos</replaceable>[,<replaceable>timeout</replaceable>])</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -15785,7 +15785,7 @@
               <primary>NAME_CONST()</primary>
             </indexterm>
 
-            <literal>NAME_CONST(<replaceable>name</replaceable>,<replaceable>value</replaceable>)</literal>
+            <function role="sql">NAME_CONST(<replaceable>name</replaceable>,<replaceable>value</replaceable>)</function>
           </para>
 
           <remark role="help-syntax-end"/>


Modified: trunk/refman-5.1/errors-problems-core.xml
===================================================================
--- trunk/refman-5.1/errors-problems-core.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-5.1/errors-problems-core.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 682 bytes

@@ -5190,7 +5190,7 @@
             <para>
               You can't use <quote><literal>_</literal></quote> or
               <quote><literal>%</literal></quote> with
-              <literal>ESCAPE</literal> in <function role="sqlop">LIKE ...
+              <literal>ESCAPE</literal> in <function role="sqlop" condition="like">LIKE ...
               ESCAPE</function>.
             </para>
           </listitem>


Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-5.1/functions-core.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 18, Lines Added: 18, Lines Deleted: 18; 6726 bytes

@@ -2079,7 +2079,7 @@
             <primary>NULLIF()</primary>
           </indexterm>
 
-          <literal>NULLIF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</literal>
+          <function role="sql">NULLIF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3093,7 +3093,7 @@
             <primary>LOWER()</primary>
           </indexterm>
 
-          <literal>LOWER(<replaceable>str</replaceable>)</literal>
+          <function role="sql">LOWER(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3131,7 +3131,7 @@
             <primary>LPAD()</primary>
           </indexterm>
 
-          <literal>LPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</literal>
+          <function role="sql">LPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</function>
         </para>
 
         <para>

@@ -3169,7 +3169,7 @@
             <primary>LTRIM()</primary>
           </indexterm>
 
-          <literal>LTRIM(<replaceable>str</replaceable>)</literal>
+          <function role="sql">LTRIM(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3205,7 +3205,7 @@
             <primary>MAKE_SET()</primary>
           </indexterm>
 
-          <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
+          <function role="sql">MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3251,7 +3251,7 @@
             <primary>MID()</primary>
           </indexterm>
 
-          <literal>MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>
+          <function role="sql">MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3259,7 +3259,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          <literal>MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>
+          <function role="sql">MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</function>
           is a synonym for
           <literal>SUBSTRING(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>.
         </para>

@@ -3277,7 +3277,7 @@
             <primary>OCTET_LENGTH()</primary>
           </indexterm>
 
-          <literal>OCTET_LENGTH(<replaceable>str</replaceable>)</literal>
+          <function role="sql">OCTET_LENGTH(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3302,7 +3302,7 @@
             <primary>ORD()</primary>
           </indexterm>
 
-          <literal>ORD(<replaceable>str</replaceable>)</literal>
+          <function role="sql">ORD(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -6699,7 +6699,7 @@
               <primary>OCT()</primary>
             </indexterm>
 
-            <literal>OCT(<replaceable>N</replaceable>)</literal>
+            <function role="sql">OCT(<replaceable>N</replaceable>)</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -8971,7 +8971,7 @@
             <primary>MAKEDATE()</primary>
           </indexterm>
 
-          <literal>MAKEDATE(<replaceable>year</replaceable>,<replaceable>dayofyear</replaceable>)</literal>
+          <function role="sql">MAKEDATE(<replaceable>year</replaceable>,<replaceable>dayofyear</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9008,7 +9008,7 @@
             <primary>MAKETIME()</primary>
           </indexterm>
 
-          <literal>MAKETIME(<replaceable>hour</replaceable>,<replaceable>minute</replaceable>,<replaceable>second</replaceable>)</literal>
+          <function role="sql">MAKETIME(<replaceable>hour</replaceable>,<replaceable>minute</replaceable>,<replaceable>second</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9042,7 +9042,7 @@
             <primary>MICROSECOND()</primary>
           </indexterm>
 
-          <literal>MICROSECOND(<replaceable>expr</replaceable>)</literal>
+          <function role="sql">MICROSECOND(<replaceable>expr</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9077,7 +9077,7 @@
             <primary>MINUTE()</primary>
           </indexterm>
 
-          <literal>MINUTE(<replaceable>time</replaceable>)</literal>
+          <function role="sql">MINUTE(<replaceable>time</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9109,7 +9109,7 @@
             <primary>MONTH()</primary>
           </indexterm>
 
-          <literal>MONTH(<replaceable>date</replaceable>)</literal>
+          <function role="sql">MONTH(<replaceable>date</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9144,7 +9144,7 @@
             <primary>MONTHNAME()</primary>
           </indexterm>
 
-          <literal>MONTHNAME(<replaceable>date</replaceable>)</literal>
+          <function role="sql">MONTHNAME(<replaceable>date</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -16736,7 +16736,7 @@
               <primary>MASTER_POS_WAIT()</primary>
             </indexterm>
 
-            <literal>MASTER_POS_WAIT(<replaceable>log_name</replaceable>,<replaceable>log_pos</replaceable>[,<replaceable>timeout</replaceable>])</literal>
+            <function role="sql">MASTER_POS_WAIT(<replaceable>log_name</replaceable>,<replaceable>log_pos</replaceable>[,<replaceable>timeout</replaceable>])</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -16782,7 +16782,7 @@
               <primary>NAME_CONST()</primary>
             </indexterm>
 
-            <literal>NAME_CONST(<replaceable>name</replaceable>,<replaceable>value</replaceable>)</literal>
+            <function role="sql">NAME_CONST(<replaceable>name</replaceable>,<replaceable>value</replaceable>)</function>
           </para>
 
           <remark role="help-syntax-end"/>


Modified: trunk/refman-5.1/partitioning-guide.xml
===================================================================
--- trunk/refman-5.1/partitioning-guide.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-5.1/partitioning-guide.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 6, Lines Added: 12, Lines Deleted: 12; 4048 bytes

@@ -1131,7 +1131,7 @@
         <literal>DATE</literal> columns instead. For example, let us
         suppose that you wish to partition based on the year that each
         employee left the company; that is, the value of
-        <literal>YEAR(separated)</literal>. An example of a
+        <function role="sql">YEAR(separated)</function>. An example of a
         <literal>CREATE TABLE</literal> statement that implements such a
         partitioning scheme is shown here:
       </para>

@@ -1623,20 +1623,20 @@
       <para>
         For example, where <literal>date_col</literal> is a column of
         type <literal>DATE</literal>, then the expression
-        <literal>TO_DAYS(date_col)</literal> is said to vary directly
+        <function role="sql">TO_DAYS(date_col)</function> is said to vary directly
         with the value of <literal>date_col</literal>, because for every
         change in the value of <literal>date_col</literal>, the value of
         the expression changes in a consistent manner. The variance of
-        the expression <literal>YEAR(date_col)</literal> with respect to
+        the expression <function role="sql">YEAR(date_col)</function> with respect to
         <literal>date_col</literal> is not quite as direct as that of
-        <literal>TO_DAYS(date_col)</literal>, because not every possible
+        <function role="sql">TO_DAYS(date_col)</function>, because not every possible
         change in <literal>date_col</literal> produces an equivalent
-        change in <literal>YEAR(date_col)</literal>. Even so,
-        <literal>YEAR(date_col)</literal> is a good candidate for a
+        change in <function role="sql">YEAR(date_col)</function>. Even so,
+        <function role="sql">YEAR(date_col)</function> is a good candidate for a
         hashing function, because it varies directly with a portion of
         <literal>date_col</literal> and there is no possible change in
         <literal>date_col</literal> that produces a disproportionate
-        change in <literal>YEAR(date_col)</literal>.
+        change in <function role="sql">YEAR(date_col)</function>.
       </para>
 
       <para>

@@ -2622,7 +2622,7 @@
 </programlisting>
 
       <para>
-        As with other MySQL functions, <literal>YEAR(NULL)</literal>
+        As with other MySQL functions, <function role="sql">YEAR(NULL)</function>
         returns <literal>NULL</literal>. A row with a
         <literal>dt</literal> column value of <literal>NULL</literal> is
         treated as though the partitioning expression evaluated to a

@@ -3402,9 +3402,9 @@
         <literal>p0</literal> into the new partitions according to the
         rules embodied in the two <literal>PARTITION ... VALUES
         ...</literal> clauses, so that <literal>s0</literal> contains
-        only those records for which <literal>YEAR(dob)</literal> is
+        only those records for which <function role="sql">YEAR(dob)</function> is
         less than 1960 and <literal>s1</literal> contains those rows in
-        which <literal>YEAR(dob)</literal> is greater than or equal to
+        which <function role="sql">YEAR(dob)</function> is greater than or equal to
         1960 but less than 1970.
       </para>
 

@@ -4377,7 +4377,7 @@
         </para>
 
         <para>
-          <literal>YEAR('1984-06-21')</literal> yields the value
+          <function role="sql">YEAR('1984-06-21')</function> yields the value
           <literal>1984</literal>, which is found in partition
           <literal>d3</literal>.
         </para>

@@ -4390,7 +4390,7 @@
         </para>
 
         <para>
-          <literal>YEAR('1999-06-21')</literal> evaluates to
+          <function role="sql">YEAR('1999-06-21')</function> evaluates to
           <literal>1999</literal>, which is found in partition
           <literal>d5</literal>.
         </para>


Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-5.1/partitioning.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 6, Lines Added: 12, Lines Deleted: 12; 4028 bytes

@@ -924,7 +924,7 @@
         <literal>DATE</literal> columns instead. For example, let us
         suppose that you wish to partition based on the year that each
         employee left the company; that is, the value of
-        <literal>YEAR(separated)</literal>. An example of a
+        <function role="sql">YEAR(separated)</function>. An example of a
         <literal>CREATE TABLE</literal> statement that implements such a
         partitioning scheme is shown here:
       </para>

@@ -1350,20 +1350,20 @@
       <para>
         For example, where <literal>date_col</literal> is a column of
         type <literal>DATE</literal>, then the expression
-        <literal>TO_DAYS(date_col)</literal> is said to vary directly
+        <function role="sql">TO_DAYS(date_col)</function> is said to vary directly
         with the value of <literal>date_col</literal>, because for every
         change in the value of <literal>date_col</literal>, the value of
         the expression changes in a consistent manner. The variance of
-        the expression <literal>YEAR(date_col)</literal> with respect to
+        the expression <function role="sql">YEAR(date_col)</function> with respect to
         <literal>date_col</literal> is not quite as direct as that of
-        <literal>TO_DAYS(date_col)</literal>, because not every possible
+        <function role="sql">TO_DAYS(date_col)</function>, because not every possible
         change in <literal>date_col</literal> produces an equivalent
-        change in <literal>YEAR(date_col)</literal>. Even so,
-        <literal>YEAR(date_col)</literal> is a good candidate for a
+        change in <function role="sql">YEAR(date_col)</function>. Even so,
+        <function role="sql">YEAR(date_col)</function> is a good candidate for a
         hashing function, because it varies directly with a portion of
         <literal>date_col</literal> and there is no possible change in
         <literal>date_col</literal> that produces a disproportionate
-        change in <literal>YEAR(date_col)</literal>.
+        change in <function role="sql">YEAR(date_col)</function>.
       </para>
 
       <para>

@@ -2355,7 +2355,7 @@
 </programlisting>
 
       <para>
-        As with other MySQL functions, <literal>YEAR(NULL)</literal>
+        As with other MySQL functions, <function role="sql">YEAR(NULL)</function>
         returns <literal>NULL</literal>. A row with a
         <literal>dt</literal> column value of <literal>NULL</literal> is
         treated as though the partitioning expression evaluated to a

@@ -3150,9 +3150,9 @@
         <literal>p0</literal> into the new partitions according to the
         rules embodied in the two <literal>PARTITION ... VALUES
         ...</literal> clauses, so that <literal>s0</literal> contains
-        only those records for which <literal>YEAR(dob)</literal> is
+        only those records for which <function role="sql">YEAR(dob)</function> is
         less than 1960 and <literal>s1</literal> contains those rows in
-        which <literal>YEAR(dob)</literal> is greater than or equal to
+        which <function role="sql">YEAR(dob)</function> is greater than or equal to
         1960 but less than 1970.
       </para>
 

@@ -4113,7 +4113,7 @@
         </para>
 
         <para>
-          <literal>YEAR('1984-06-21')</literal> yields the value
+          <function role="sql">YEAR('1984-06-21')</function> yields the value
           <literal>1984</literal>, which is found in partition
           <literal>d3</literal>.
         </para>

@@ -4126,7 +4126,7 @@
         </para>
 
         <para>
-          <literal>YEAR('1999-06-21')</literal> evaluates to
+          <function role="sql">YEAR('1999-06-21')</function> evaluates to
           <literal>1999</literal>, which is found in partition
           <literal>d5</literal>.
         </para>


Modified: trunk/refman-6.0/errors-problems.xml
===================================================================
--- trunk/refman-6.0/errors-problems.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-6.0/errors-problems.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 667 bytes

@@ -5185,7 +5185,7 @@
             <para>
               You can't use <quote><literal>_</literal></quote> or
               <quote><literal>%</literal></quote> with
-              <literal>ESCAPE</literal> in <function role="sqlop">LIKE ...
+              <literal>ESCAPE</literal> in <function role="sqlop" condition="like">LIKE ...
               ESCAPE</function>.
             </para>
           </listitem>


Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-6.0/functions-core.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 18, Lines Added: 18, Lines Deleted: 18; 6726 bytes

@@ -2079,7 +2079,7 @@
             <primary>NULLIF()</primary>
           </indexterm>
 
-          <literal>NULLIF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</literal>
+          <function role="sql">NULLIF(<replaceable>expr1</replaceable>,<replaceable>expr2</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3092,7 +3092,7 @@
             <primary>LOWER()</primary>
           </indexterm>
 
-          <literal>LOWER(<replaceable>str</replaceable>)</literal>
+          <function role="sql">LOWER(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3130,7 +3130,7 @@
             <primary>LPAD()</primary>
           </indexterm>
 
-          <literal>LPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</literal>
+          <function role="sql">LPAD(<replaceable>str</replaceable>,<replaceable>len</replaceable>,<replaceable>padstr</replaceable>)</function>
         </para>
 
         <para>

@@ -3168,7 +3168,7 @@
             <primary>LTRIM()</primary>
           </indexterm>
 
-          <literal>LTRIM(<replaceable>str</replaceable>)</literal>
+          <function role="sql">LTRIM(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3204,7 +3204,7 @@
             <primary>MAKE_SET()</primary>
           </indexterm>
 
-          <literal>MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</literal>
+          <function role="sql">MAKE_SET(<replaceable>bits</replaceable>,<replaceable>str1</replaceable>,<replaceable>str2</replaceable>,...)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3250,7 +3250,7 @@
             <primary>MID()</primary>
           </indexterm>
 
-          <literal>MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>
+          <function role="sql">MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3258,7 +3258,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          <literal>MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>
+          <function role="sql">MID(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</function>
           is a synonym for
           <literal>SUBSTRING(<replaceable>str</replaceable>,<replaceable>pos</replaceable>,<replaceable>len</replaceable>)</literal>.
         </para>

@@ -3276,7 +3276,7 @@
             <primary>OCTET_LENGTH()</primary>
           </indexterm>
 
-          <literal>OCTET_LENGTH(<replaceable>str</replaceable>)</literal>
+          <function role="sql">OCTET_LENGTH(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -3301,7 +3301,7 @@
             <primary>ORD()</primary>
           </indexterm>
 
-          <literal>ORD(<replaceable>str</replaceable>)</literal>
+          <function role="sql">ORD(<replaceable>str</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -7035,7 +7035,7 @@
               <primary>OCT()</primary>
             </indexterm>
 
-            <literal>OCT(<replaceable>N</replaceable>)</literal>
+            <function role="sql">OCT(<replaceable>N</replaceable>)</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -9294,7 +9294,7 @@
             <primary>MAKEDATE()</primary>
           </indexterm>
 
-          <literal>MAKEDATE(<replaceable>year</replaceable>,<replaceable>dayofyear</replaceable>)</literal>
+          <function role="sql">MAKEDATE(<replaceable>year</replaceable>,<replaceable>dayofyear</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9331,7 +9331,7 @@
             <primary>MAKETIME()</primary>
           </indexterm>
 
-          <literal>MAKETIME(<replaceable>hour</replaceable>,<replaceable>minute</replaceable>,<replaceable>second</replaceable>)</literal>
+          <function role="sql">MAKETIME(<replaceable>hour</replaceable>,<replaceable>minute</replaceable>,<replaceable>second</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9365,7 +9365,7 @@
             <primary>MICROSECOND()</primary>
           </indexterm>
 
-          <literal>MICROSECOND(<replaceable>expr</replaceable>)</literal>
+          <function role="sql">MICROSECOND(<replaceable>expr</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9400,7 +9400,7 @@
             <primary>MINUTE()</primary>
           </indexterm>
 
-          <literal>MINUTE(<replaceable>time</replaceable>)</literal>
+          <function role="sql">MINUTE(<replaceable>time</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9432,7 +9432,7 @@
             <primary>MONTH()</primary>
           </indexterm>
 
-          <literal>MONTH(<replaceable>date</replaceable>)</literal>
+          <function role="sql">MONTH(<replaceable>date</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -9467,7 +9467,7 @@
             <primary>MONTHNAME()</primary>
           </indexterm>
 
-          <literal>MONTHNAME(<replaceable>date</replaceable>)</literal>
+          <function role="sql">MONTHNAME(<replaceable>date</replaceable>)</function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -17038,7 +17038,7 @@
               <primary>MASTER_POS_WAIT()</primary>
             </indexterm>
 
-            <literal>MASTER_POS_WAIT(<replaceable>log_name</replaceable>,<replaceable>log_pos</replaceable>[,<replaceable>timeout</replaceable>])</literal>
+            <function role="sql">MASTER_POS_WAIT(<replaceable>log_name</replaceable>,<replaceable>log_pos</replaceable>[,<replaceable>timeout</replaceable>])</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -17084,7 +17084,7 @@
               <primary>NAME_CONST()</primary>
             </indexterm>
 
-            <literal>NAME_CONST(<replaceable>name</replaceable>,<replaceable>value</replaceable>)</literal>
+            <function role="sql">NAME_CONST(<replaceable>name</replaceable>,<replaceable>value</replaceable>)</function>
           </para>
 
           <remark role="help-syntax-end"/>


Modified: trunk/refman-6.0/partitioning-guide.xml
===================================================================
--- trunk/refman-6.0/partitioning-guide.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-6.0/partitioning-guide.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 6, Lines Added: 12, Lines Deleted: 12; 4048 bytes

@@ -1100,7 +1100,7 @@
         <literal>DATE</literal> columns instead. For example, let us
         suppose that you wish to partition based on the year that each
         employee left the company; that is, the value of
-        <literal>YEAR(separated)</literal>. An example of a
+        <function role="sql">YEAR(separated)</function>. An example of a
         <literal>CREATE TABLE</literal> statement that implements such a
         partitioning scheme is shown here:
       </para>

@@ -1592,20 +1592,20 @@
       <para>
         For example, where <literal>date_col</literal> is a column of
         type <literal>DATE</literal>, then the expression
-        <literal>TO_DAYS(date_col)</literal> is said to vary directly
+        <function role="sql">TO_DAYS(date_col)</function> is said to vary directly
         with the value of <literal>date_col</literal>, because for every
         change in the value of <literal>date_col</literal>, the value of
         the expression changes in a consistent manner. The variance of
-        the expression <literal>YEAR(date_col)</literal> with respect to
+        the expression <function role="sql">YEAR(date_col)</function> with respect to
         <literal>date_col</literal> is not quite as direct as that of
-        <literal>TO_DAYS(date_col)</literal>, because not every possible
+        <function role="sql">TO_DAYS(date_col)</function>, because not every possible
         change in <literal>date_col</literal> produces an equivalent
-        change in <literal>YEAR(date_col)</literal>. Even so,
-        <literal>YEAR(date_col)</literal> is a good candidate for a
+        change in <function role="sql">YEAR(date_col)</function>. Even so,
+        <function role="sql">YEAR(date_col)</function> is a good candidate for a
         hashing function, because it varies directly with a portion of
         <literal>date_col</literal> and there is no possible change in
         <literal>date_col</literal> that produces a disproportionate
-        change in <literal>YEAR(date_col)</literal>.
+        change in <function role="sql">YEAR(date_col)</function>.
       </para>
 
       <para>

@@ -2577,7 +2577,7 @@
 </programlisting>
 
       <para>
-        As with other MySQL functions, <literal>YEAR(NULL)</literal>
+        As with other MySQL functions, <function role="sql">YEAR(NULL)</function>
         returns <literal>NULL</literal>. A row with a
         <literal>dt</literal> column value of <literal>NULL</literal> is
         treated as though the partitioning expression evaluated to a

@@ -3347,9 +3347,9 @@
         <literal>p0</literal> into the new partitions according to the
         rules embodied in the two <literal>PARTITION ... VALUES
         ...</literal> clauses, so that <literal>s0</literal> contains
-        only those records for which <literal>YEAR(dob)</literal> is
+        only those records for which <function role="sql">YEAR(dob)</function> is
         less than 1960 and <literal>s1</literal> contains those rows in
-        which <literal>YEAR(dob)</literal> is greater than or equal to
+        which <function role="sql">YEAR(dob)</function> is greater than or equal to
         1960 but less than 1970.
       </para>
 

@@ -4294,7 +4294,7 @@
         </para>
 
         <para>
-          <literal>YEAR('1984-06-21')</literal> yields the value
+          <function role="sql">YEAR('1984-06-21')</function> yields the value
           <literal>1984</literal>, which is found in partition
           <literal>d3</literal>.
         </para>

@@ -4307,7 +4307,7 @@
         </para>
 
         <para>
-          <literal>YEAR('1999-06-21')</literal> evaluates to
+          <function role="sql">YEAR('1999-06-21')</function> evaluates to
           <literal>1999</literal>, which is found in partition
           <literal>d5</literal>.
         </para>


Modified: trunk/refman-6.0/partitioning.xml
===================================================================
--- trunk/refman-6.0/partitioning.xml	2008-01-09 19:14:57 UTC (rev 9536)
+++ trunk/refman-6.0/partitioning.xml	2008-01-09 19:15:12 UTC (rev 9537)
Changed blocks: 6, Lines Added: 12, Lines Deleted: 12; 4028 bytes

@@ -891,7 +891,7 @@
         <literal>DATE</literal> columns instead. For example, let us
         suppose that you wish to partition based on the year that each
         employee left the company; that is, the value of
-        <literal>YEAR(separated)</literal>. An example of a
+        <function role="sql">YEAR(separated)</function>. An example of a
         <literal>CREATE TABLE</literal> statement that implements such a
         partitioning scheme is shown here:
       </para>

@@ -1317,20 +1317,20 @@
       <para>
         For example, where <literal>date_col</literal> is a column of
         type <literal>DATE</literal>, then the expression
-        <literal>TO_DAYS(date_col)</literal> is said to vary directly
+        <function role="sql">TO_DAYS(date_col)</function> is said to vary directly
         with the value of <literal>date_col</literal>, because for every
         change in the value of <literal>date_col</literal>, the value of
         the expression changes in a consistent manner. The variance of
-        the expression <literal>YEAR(date_col)</literal> with respect to
+        the expression <function role="sql">YEAR(date_col)</function> with respect to
         <literal>date_col</literal> is not quite as direct as that of
-        <literal>TO_DAYS(date_col)</literal>, because not every possible
+        <function role="sql">TO_DAYS(date_col)</function>, because not every possible
         change in <literal>date_col</literal> produces an equivalent
-        change in <literal>YEAR(date_col)</literal>. Even so,
-        <literal>YEAR(date_col)</literal> is a good candidate for a
+        change in <function role="sql">YEAR(date_col)</function>. Even so,
+        <function role="sql">YEAR(date_col)</function> is a good candidate for a
         hashing function, because it varies directly with a portion of
         <literal>date_col</literal> and there is no possible change in
         <literal>date_col</literal> that produces a disproportionate
-        change in <literal>YEAR(date_col)</literal>.
+        change in <function role="sql">YEAR(date_col)</function>.
       </para>
 
       <para>

@@ -2304,7 +2304,7 @@
 </programlisting>
 
       <para>
-        As with other MySQL functions, <literal>YEAR(NULL)</literal>
+        As with other MySQL functions, <function role="sql">YEAR(NULL)</function>
         returns <literal>NULL</literal>. A row with a
         <literal>dt</literal> column value of <literal>NULL</literal> is
         treated as though the partitioning expression evaluated to a

@@ -3074,9 +3074,9 @@
         <literal>p0</literal> into the new partitions according to the
         rules embodied in the two <literal>PARTITION ... VALUES
         ...</literal> clauses, so that <literal>s0</literal> contains
-        only those records for which <literal>YEAR(dob)</literal> is
+        only those records for which <function role="sql">YEAR(dob)</function> is
         less than 1960 and <literal>s1</literal> contains those rows in
-        which <literal>YEAR(dob)</literal> is greater than or equal to
+        which <function role="sql">YEAR(dob)</function> is greater than or equal to
         1960 but less than 1970.
       </para>
 

@@ -4013,7 +4013,7 @@
         </para>
 
         <para>
-          <literal>YEAR('1984-06-21')</literal> yields the value
+          <function role="sql">YEAR('1984-06-21')</function> yields the value
           <literal>1984</literal>, which is found in partition
           <literal>d3</literal>.
         </para>

@@ -4026,7 +4026,7 @@
         </para>
 
         <para>
-          <literal>YEAR('1999-06-21')</literal> evaluates to
+          <function role="sql">YEAR('1999-06-21')</function> evaluates to
           <literal>1999</literal>, which is found in partition
           <literal>d5</literal>.
         </para>


Thread
svn commit - mysqldoc@docsrva: r9537 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0paul9 Jan