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

Log:
 r34798@arctic:  paul | 2008-01-09 11:20:11 -0600
 Add markup.


Modified:
   trunk/refman-4.1/data-types.xml
   trunk/refman-4.1/dba-core.xml
   trunk/refman-4.1/errors-problems.xml
   trunk/refman-4.1/functions-core.xml
   trunk/refman-4.1/internationalization.xml
   trunk/refman-4.1/introduction.xml
   trunk/refman-4.1/language-structure.xml
   trunk/refman-4.1/restrictions.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-4.1/tutorial.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.0/dba-core.xml
   trunk/refman-5.0/errors-problems.xml
   trunk/refman-5.0/faqs.xml
   trunk/refman-5.0/functions-core.xml
   trunk/refman-5.0/information-schema.xml
   trunk/refman-5.0/internationalization.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.0/language-structure-core.xml
   trunk/refman-5.0/replication-configuration.xml
   trunk/refman-5.0/restrictions.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.0/tutorial.xml
   trunk/refman-5.1/ccsg-temp.xml
   trunk/refman-5.1/data-types.xml
   trunk/refman-5.1/dba-core-new-tmp.xml
   trunk/refman-5.1/dba-core.xml
   trunk/refman-5.1/errors-problems-core.xml
   trunk/refman-5.1/faqs.xml
   trunk/refman-5.1/functions-core.xml
   trunk/refman-5.1/information-schema.xml
   trunk/refman-5.1/internationalization.xml
   trunk/refman-5.1/introduction.xml
   trunk/refman-5.1/language-structure-core.xml
   trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
   trunk/refman-5.1/mysql-cluster-management.xml
   trunk/refman-5.1/partitioning-guide.xml
   trunk/refman-5.1/replication-configuration.xml
   trunk/refman-5.1/restrictions.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-5.1/tutorial.xml
   trunk/refman-6.0/data-types.xml
   trunk/refman-6.0/dba-core.xml
   trunk/refman-6.0/errors-problems.xml
   trunk/refman-6.0/faqs.xml
   trunk/refman-6.0/functions-core.xml
   trunk/refman-6.0/information-schema.xml
   trunk/refman-6.0/internationalization.xml
   trunk/refman-6.0/introduction.xml
   trunk/refman-6.0/language-structure-core.xml
   trunk/refman-6.0/mysql-cluster-management.xml
   trunk/refman-6.0/partitioning-guide.xml
   trunk/refman-6.0/replication-configuration.xml
   trunk/refman-6.0/restrictions.xml
   trunk/refman-6.0/sql-syntax.xml
   trunk/refman-6.0/tutorial.xml
   trunk/refman-common/news-innodb.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:34780
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:34798
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/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-4.1/data-types.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 556 bytes

@@ -5473,7 +5473,7 @@
       <para>
         Normally, you search for <literal>SET</literal> values using the
         <function role="sql">FIND_IN_SET()</function> function or the
-        <literal>LIKE</literal> operator:
+        <function role="sqlop">LIKE</function> operator:
       </para>
 
 <programlisting>


Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-4.1/dba-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 6, Lines Added: 7, Lines Deleted: 7; 2871 bytes

@@ -6809,9 +6809,9 @@
       </remark>
 
       <para>
-        With a <literal>LIKE</literal> clause, the statement displays
+        With a <function role="sqlop">LIKE</function> clause, the statement
displays
         only those variables that match the pattern. To obtain a
-        specific variable name, use a <literal>LIKE</literal> clause as
+        specific variable name, use a <function role="sqlop">LIKE</function>
clause as
         shown:
       </para>
 

@@ -6823,7 +6823,7 @@
       <para>
         To get a list of variables whose name match a pattern, use the
         <quote><literal>%</literal></quote> wildcard character in
a
-        <literal>LIKE</literal> clause:
+        <function role="sqlop">LIKE</function> clause:
       </para>
 
 <programlisting>

@@ -7098,7 +7098,7 @@
         <para>
           However, the following statement does not work. The variable
           is not interpreted as a compound name, but as a simple string
-          for a <literal>LIKE</literal> pattern-matching operation:
+          for a <function role="sqlop">LIKE</function> pattern-matching
operation:
         </para>
 
 <programlisting>

@@ -13288,7 +13288,7 @@
             <quote><literal>_</literal></quote> in
             <literal>Host</literal> column values. These have the same
             meaning as for pattern-matching operations performed with
-            the <literal>LIKE</literal> operator. For example, a
+            the <function role="sqlop">LIKE</function> operator. For example,
a
             <literal>Host</literal> value of
<literal>'%'</literal>
             matches any hostname, whereas a value of
             <literal>'%.mysql.com'</literal> matches any host in the

@@ -13815,7 +13815,7 @@
             <literal>Host</literal> and <literal>Db</literal>
columns of
             either table. These have the same meaning as for
             pattern-matching operations performed with the
-            <literal>LIKE</literal> operator. If you want to use either
+            <function role="sqlop">LIKE</function> operator. If you want to
use either
             character literally when granting privileges, you must
             escape it with a backslash. For example, to include
             <quote><literal>_</literal></quote> character as part
of a

@@ -13926,7 +13926,7 @@
             and <quote><literal>_</literal></quote> can be used
in the
             <literal>Host</literal> column. These have the same meaning
             as for pattern-matching operations performed with the
-            <literal>LIKE</literal> operator.
+            <function role="sqlop">LIKE</function> operator.
           </para>
         </listitem>
 


Modified: trunk/refman-4.1/errors-problems.xml
===================================================================
--- trunk/refman-4.1/errors-problems.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-4.1/errors-problems.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 669 bytes

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


Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-4.1/functions-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 12, Lines Added: 17, Lines Deleted: 17; 5187 bytes

@@ -1628,7 +1628,7 @@
               <secondary>logical</secondary>
             </indexterm>
 
-            <literal>XOR</literal>
+            <function role="sqlop">XOR</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -3622,8 +3622,8 @@
             <primary>SOUNDS LIKE</primary>
           </indexterm>
 
-          <literal><replaceable>expr1</replaceable> SOUNDS LIKE
-          <replaceable>expr2</replaceable></literal>
+          <function role="sqlop"
condition="sounds-like"><replaceable>expr1</replaceable> SOUNDS LIKE
+          <replaceable>expr2</replaceable></function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -4092,9 +4092,9 @@
               <primary>LIKE</primary>
             </indexterm>
 
-            <literal><replaceable>expr</replaceable> LIKE
+            <function role="sqlop"
condition="like"><replaceable>expr</replaceable> LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape_char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -4119,7 +4119,7 @@
           <remark role="help-description-end"/>
 
           <para>
-            Per the SQL standard, <literal>LIKE</literal> performs
+            Per the SQL standard, <function role="sqlop">LIKE</function>
performs
             matching on a per-character basis, thus it can produce
             results different from the
             <function role="sqlop" condition="equal">=</function>

@@ -4142,7 +4142,7 @@
 </programlisting>
 
           <para>
-            With <literal>LIKE</literal> you can use the following two
+            With <function role="sqlop">LIKE</function> you can use the
following two
             wildcard characters in the pattern:
           </para>
 

@@ -4235,9 +4235,9 @@
 </programlisting>
 
           <para>
-            In MySQL, <literal>LIKE</literal> is allowed on numeric
+            In MySQL, <function role="sqlop">LIKE</function> is allowed on
numeric
             expressions. (This is an extension to the standard SQL
-            <literal>LIKE</literal>.)
+            <function role="sqlop">LIKE</function>.)
           </para>
 
 <programlisting>

@@ -4251,7 +4251,7 @@
               example, <quote><literal>\n</literal></quote> to
represent
               a newline character), you must double any
               <quote><literal>\</literal></quote> that you use in
-              <literal>LIKE</literal> strings. For example, to search
+              <function role="sqlop">LIKE</function> strings. For example, to
search
               for <quote><literal>\n</literal></quote>, specify
it as
               <quote><literal>\\n</literal></quote>. To search
for
               <quote><literal>\</literal></quote>, specify it as

@@ -4277,9 +4277,9 @@
               <primary>NOT LIKE</primary>
             </indexterm>
 
-            <literal><replaceable>expr</replaceable> NOT LIKE
+            <function role="sqlop"
condition="not-like"><replaceable>expr</replaceable> NOT LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape_char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -4297,7 +4297,7 @@
 
           <note>
             <para>
-              Aggegate queries involving <literal>NOT LIKE</literal>
+              Aggegate queries involving <function role="sqlop">NOT
LIKE</function>
               comparisons with columns containing
               <literal>NULL</literal> may yield unexpected results. For
               example, consider the following table and data:

@@ -10519,10 +10519,10 @@
     <remark role="help-syntax"/>
 
     <para id="function_match">
-      <literal>MATCH
+      <function role="sql" condition="match">MATCH
      
(<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
       AGAINST (<replaceable>expr</replaceable>
-      [<replaceable>search_modifier</replaceable>])</literal>
+      [<replaceable>search_modifier</replaceable>])</function>
     </para>
 
 <programlisting>

@@ -12824,7 +12824,7 @@
           <function role="sql">CONVERT()</function> function to convert
           the value to a non-binary string. If the character set of the
           result has a case-insensitive collation, the
-          <literal>LIKE</literal> operation is not case sensitive:
+          <function role="sqlop">LIKE</function> operation is not case
sensitive:
         </para>
 
 <programlisting>

@@ -15980,7 +15980,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Returns the bitwise <literal>XOR</literal> of all bits in
+            Returns the bitwise <function role="sqlop">XOR</function> of all
bits in
             <replaceable>expr</replaceable>. The calculation is
             performed with 64-bit (<literal>BIGINT</literal>) precision.
           </para>


Modified: trunk/refman-4.1/internationalization.xml
===================================================================
--- trunk/refman-4.1/internationalization.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-4.1/internationalization.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1041 bytes

@@ -2511,7 +2511,7 @@
         <para>
           The <literal>SHOW CHARACTER SET</literal> command shows all
           available character sets. It takes an optional
-          <literal>LIKE</literal> clause that indicates which character
+          <function role="sqlop">LIKE</function> clause that indicates which
character
           set names to match. For example:
         </para>
 

@@ -2530,7 +2530,7 @@
         <para>
           The output from <literal>SHOW COLLATION</literal> includes all
           available character sets. It takes an optional
-          <literal>LIKE</literal> clause that indicates which collation
+          <function role="sqlop">LIKE</function> clause that indicates which
collation
           names to match. For example:
         </para>
 


Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-4.1/introduction.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 522 bytes

@@ -1820,7 +1820,7 @@
 
             <listitem>
               <para>
-                <literal>LIKE</literal> is allowed on numeric values.
+                <function role="sqlop">LIKE</function> is allowed on numeric
values.
               </para>
             </listitem>
 


Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-4.1/language-structure.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 826 bytes

@@ -366,7 +366,7 @@
         <quote><literal>%</literal></quote> and
         <quote><literal>_</literal></quote> in pattern-matching
contexts
         where they would otherwise be interpreted as wildcard
-        characters. See the description of the <literal>LIKE</literal>
+        characters. See the description of the <function
role="sqlop">LIKE</function>
         operator in <xref linkend="string-comparison-functions"/>. If
         you use <quote><literal>\%</literal></quote> or
         <quote><literal>\_</literal></quote> in
non-pattern-matching


Modified: trunk/refman-4.1/restrictions.xml
===================================================================
--- trunk/refman-4.1/restrictions.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-4.1/restrictions.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 745 bytes

@@ -776,7 +776,7 @@
             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 <literal>SLEEP()</literal> on Windows and Linux may
+            call to <function role="sql">SLEEP()</function> on Windows and
Linux may
             differ slightly due to the differences in precision.
           </para>
         </listitem>


Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-4.1/sql-syntax.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 6, Lines Added: 8, Lines Deleted: 8; 2713 bytes

@@ -15276,8 +15276,8 @@
 
       <para>
         If the syntax for a given <literal>SHOW</literal> statement
-        includes a <literal>LIKE
-        '<replaceable>pattern</replaceable>'</literal> part,
+        includes a <function role="sqlop" condition="like">LIKE
+        '<replaceable>pattern</replaceable>'</function> part,
         <literal>'<replaceable>pattern</replaceable>'</literal>
is a
         string that can contain the SQL
         <quote><literal>%</literal></quote> and

@@ -15321,7 +15321,7 @@
         <para>
           The <literal>SHOW CHARACTER SET</literal> statement shows all
           available character sets. It takes an optional
-          <literal>LIKE</literal> clause that indicates which character
+          <function role="sqlop">LIKE</function> clause that indicates which
character
           set names to match. For example:
         </para>
 

@@ -15376,7 +15376,7 @@
         <para>
           The output from <literal>SHOW COLLATION</literal> includes all
           available character sets. It takes an optional
-          <literal>LIKE</literal> clause whose
+          <function role="sqlop">LIKE</function> clause whose
           <replaceable>pattern</replaceable> indicates which collation
           names to match. For example:
         </para>

@@ -17010,7 +17010,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          With a <literal>LIKE</literal> clause, the statement displays
+          With a <function role="sqlop">LIKE</function> clause, the statement
displays
           only rows for those variables with names that match the
           pattern:
         </para>

@@ -17507,10 +17507,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          With a <literal>LIKE</literal> clause, the statement displays
+          With a <function role="sqlop">LIKE</function> clause, the statement
displays
           only rows for those variables with names that match the
           pattern. To obtain the row for a specific variable, use a
-          <literal>LIKE</literal> clause as shown:
+          <function role="sqlop">LIKE</function> clause as shown:
         </para>
 
 <programlisting>

@@ -17521,7 +17521,7 @@
         <para>
           To get a list of variables whose name match a pattern, use the
           <quote><literal>%</literal></quote> wildcard character
in a
-          <literal>LIKE</literal> clause:
+          <function role="sqlop">LIKE</function> clause:
         </para>
 
 <programlisting>


Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-4.1/tutorial.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 1598 bytes

@@ -2074,8 +2074,8 @@
           MySQL, SQL patterns are case-insensitive by default. Some
           examples are shown here. Note that you do not use
           <literal>=</literal> or
<literal>&lt;&gt;</literal> when you
-          use SQL patterns; use the <literal>LIKE</literal> or
-          <literal>NOT LIKE</literal> comparison operators instead.
+          use SQL patterns; use the <function role="sqlop">LIKE</function> or
+          <function role="sqlop">NOT LIKE</function> comparison operators
instead.
         </para>
 
         <para>

@@ -2195,7 +2195,7 @@
             <para>
               A <function role="sqlop">REGEXP</function> pattern match
               succeeds if the pattern matches anywhere in the value
-              being tested. (This differs from a <literal>LIKE</literal>
+              being tested. (This differs from a <function
role="sqlop">LIKE</function>
               pattern match, which succeeds only if the pattern matches
               the entire value.)
             </para>

@@ -2215,7 +2215,7 @@
 
         <para>
           To demonstrate how extended regular expressions work, the
-          <literal>LIKE</literal> queries shown previously are rewritten
+          <function role="sqlop">LIKE</function> queries shown previously are
rewritten
           here to use <function role="sqlop">REGEXP</function>.
         </para>
 


Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/data-types.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 556 bytes

@@ -5280,7 +5280,7 @@
       <para>
         Normally, you search for <literal>SET</literal> values using the
         <function role="sql">FIND_IN_SET()</function> function or the
-        <literal>LIKE</literal> operator:
+        <function role="sqlop">LIKE</function> operator:
       </para>
 
 <programlisting>


Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/dba-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 6, Lines Added: 7, Lines Deleted: 7; 2875 bytes

@@ -8083,9 +8083,9 @@
       </remark>
 
       <para>
-        With a <literal>LIKE</literal> clause, the statement displays
+        With a <function role="sqlop">LIKE</function> clause, the statement
displays
         only those variables that match the pattern. To obtain a
-        specific variable name, use a <literal>LIKE</literal> clause as
+        specific variable name, use a <function role="sqlop">LIKE</function>
clause as
         shown:
       </para>
 

@@ -8097,7 +8097,7 @@
       <para>
         To get a list of variables whose name match a pattern, use the
         <quote><literal>%</literal></quote> wildcard character in
a
-        <literal>LIKE</literal> clause:
+        <function role="sqlop">LIKE</function> clause:
       </para>
 
 <programlisting>

@@ -8369,7 +8369,7 @@
         <para>
           However, the following statement does not work. The variable
           is not interpreted as a compound name, but as a simple string
-          for a <literal>LIKE</literal> pattern-matching operation:
+          for a <function role="sqlop">LIKE</function> pattern-matching
operation:
         </para>
 
 <programlisting>

@@ -15415,7 +15415,7 @@
             <quote><literal>_</literal></quote> in
             <literal>Host</literal> column values. These have the same
             meaning as for pattern-matching operations performed with
-            the <literal>LIKE</literal> operator. For example, a
+            the <function role="sqlop">LIKE</function> operator. For example,
a
             <literal>Host</literal> value of
<literal>'%'</literal>
             matches any hostname, whereas a value of
             <literal>'%.mysql.com'</literal> matches any host in the

@@ -15940,7 +15940,7 @@
             <literal>Host</literal> and <literal>Db</literal>
columns of
             either table. These have the same meaning as for
             pattern-matching operations performed with the
-            <literal>LIKE</literal> operator. If you want to use either
+            <function role="sqlop">LIKE</function> operator. If you want to
use either
             character literally when granting privileges, you must
             escape it with a backslash. For example, to include the
             underscore character
(<quote><literal>_</literal></quote>)

@@ -16052,7 +16052,7 @@
             and <quote><literal>_</literal></quote> can be used
in the
             <literal>Host</literal> column. These have the same meaning
             as for pattern-matching operations performed with the
-            <literal>LIKE</literal> operator.
+            <function role="sqlop">LIKE</function> operator.
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/errors-problems.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 669 bytes

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


Modified: trunk/refman-5.0/faqs.xml
===================================================================
--- trunk/refman-5.0/faqs.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/faqs.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 4; 1512 bytes

@@ -6085,7 +6085,7 @@
           </indexterm>
 
           <para>
-            Why do some <literal>LIKE</literal> and
+            Why do some <function role="sqlop">LIKE</function> and
             <literal>FULLTEXT</literal> searches with CJK characters
             fail?
           </para>

@@ -6095,7 +6095,7 @@
         <answer>
 
           <para>
-            There is a very simple problem with <literal>LIKE</literal>
+            There is a very simple problem with <function
role="sqlop">LIKE</function>
             searches on <literal>BINARY</literal> and
             <literal>BLOB</literal> columns: we need to know the end of
             a character. With multi-byte character sets, different

@@ -6115,8 +6115,9 @@
 
             If we don't know where the first character ends, then we
             don't know where the second character begins, in which case
-            even very simple searches such as <literal>LIKE
-            '_A%'</literal> fail. The solution is to use a regular CJK
+            even very simple searches such as <function role="sqlop"
+condition="like">LIKE
+            '_A%'</function> fail. The solution is to use a regular CJK
             character set in the first place, or to convert to a CJK
             character set before comparing.
           </para>


Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/functions-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 13, Lines Added: 18, Lines Deleted: 18; 5522 bytes

@@ -1740,7 +1740,7 @@
               <secondary>logical</secondary>
             </indexterm>
 
-            <literal>XOR</literal>
+            <function role="sqlop">XOR</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -3803,8 +3803,8 @@
             <primary>SOUNDS LIKE</primary>
           </indexterm>
 
-          <literal><replaceable>expr1</replaceable> SOUNDS LIKE
-          <replaceable>expr2</replaceable></literal>
+          <function role="sqlop"
condition="sounds-like"><replaceable>expr1</replaceable> SOUNDS LIKE
+          <replaceable>expr2</replaceable></function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -4266,9 +4266,9 @@
               <primary>LIKE</primary>
             </indexterm>
 
-            <literal><replaceable>expr</replaceable> LIKE
+            <function role="sqlop"
condition="like"><replaceable>expr</replaceable> LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape_char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -4293,7 +4293,7 @@
           <remark role="help-description-end"/>
 
           <para>
-            Per the SQL standard, <literal>LIKE</literal> performs
+            Per the SQL standard, <function role="sqlop">LIKE</function>
performs
             matching on a per-character basis, thus it can produce
             results different from the
             <function role="sqlop" condition="equal">=</function>

@@ -4316,7 +4316,7 @@
 </programlisting>
 
           <para>
-            With <literal>LIKE</literal> you can use the following two
+            With <function role="sqlop">LIKE</function> you can use the
following two
             wildcard characters in the pattern:
           </para>
 

@@ -4416,9 +4416,9 @@
 </programlisting>
 
           <para>
-            In MySQL, <literal>LIKE</literal> is allowed on numeric
+            In MySQL, <function role="sqlop">LIKE</function> is allowed on
numeric
             expressions. (This is an extension to the standard SQL
-            <literal>LIKE</literal>.)
+            <function role="sqlop">LIKE</function>.)
           </para>
 
 <programlisting>

@@ -4432,7 +4432,7 @@
               example, <quote><literal>\n</literal></quote> to
represent
               a newline character), you must double any
               <quote><literal>\</literal></quote> that you use in
-              <literal>LIKE</literal> strings. For example, to search
+              <function role="sqlop">LIKE</function> strings. For example, to
search
               for <quote><literal>\n</literal></quote>, specify
it as
               <quote><literal>\\n</literal></quote>. To search
for
               <quote><literal>\</literal></quote>, specify it as

@@ -4458,9 +4458,9 @@
               <primary>NOT LIKE</primary>
             </indexterm>
 
-            <literal><replaceable>expr</replaceable> NOT LIKE
+            <function role="sqlop"
condition="not-like"><replaceable>expr</replaceable> NOT LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape_char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -4478,7 +4478,7 @@
 
           <note>
             <para>
-              Aggregate queries involving <literal>NOT LIKE</literal>
+              Aggregate queries involving <function role="sqlop">NOT
LIKE</function>
               comparisons with columns containing
               <literal>NULL</literal> may yield unexpected results. For
               example, consider the following table and data:

@@ -10771,10 +10771,10 @@
     <remark role="help-syntax"/>
 
     <para id="function_match">
-      <literal>MATCH
+      <function role="sql" condition="match">MATCH
      
(<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
       AGAINST (<replaceable>expr</replaceable>
-      [<replaceable>search_modifier</replaceable>])</literal>
+      [<replaceable>search_modifier</replaceable>])</function>
     </para>
 
 <programlisting>

@@ -13030,7 +13030,7 @@
       To perform a case-insensitive comparison, use the
       <function role="sql">CONVERT()</function> function to convert the
       value to a non-binary string. If the character set of the result
-      has a case-insensitive collation, the <literal>LIKE</literal>
+      has a case-insensitive collation, the <function
role="sqlop">LIKE</function>
       operation is not case sensitive:
     </para>
 

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

@@ -16245,7 +16245,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Returns the bitwise <literal>XOR</literal> of all bits in
+            Returns the bitwise <function role="sqlop">XOR</function> of all
bits in
             <replaceable>expr</replaceable>. The calculation is
             performed with 64-bit (<literal>BIGINT</literal>) precision.
           </para>


Modified: trunk/refman-5.0/information-schema.xml
===================================================================
--- trunk/refman-5.0/information-schema.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/information-schema.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 677 bytes

@@ -3618,7 +3618,7 @@
 
     <para>
       <literal>SHOW</literal> statements that accept a
-      <literal>LIKE</literal> clause to limit the rows displayed have
+      <function role="sqlop">LIKE</function> clause to limit the rows
displayed have
       been extended to allow a <literal>WHERE</literal> clause that
       enables specification of more general conditions that selected
       rows must satisfy:


Modified: trunk/refman-5.0/internationalization.xml
===================================================================
--- trunk/refman-5.0/internationalization.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/internationalization.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1041 bytes

@@ -2694,7 +2694,7 @@
         <para>
           The <literal>SHOW CHARACTER SET</literal> command shows all
           available character sets. It takes an optional
-          <literal>LIKE</literal> clause that indicates which character
+          <function role="sqlop">LIKE</function> clause that indicates which
character
           set names to match. For example:
         </para>
 

@@ -2713,7 +2713,7 @@
         <para>
           The output from <literal>SHOW COLLATION</literal> includes all
           available character sets. It takes an optional
-          <literal>LIKE</literal> clause that indicates which collation
+          <function role="sqlop">LIKE</function> clause that indicates which
collation
           names to match. For example:
         </para>
 


Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/introduction.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 522 bytes

@@ -1496,7 +1496,7 @@
 
             <listitem>
               <para>
-                <literal>LIKE</literal> is allowed on numeric values.
+                <function role="sqlop">LIKE</function> is allowed on numeric
values.
               </para>
             </listitem>
 


Modified: trunk/refman-5.0/language-structure-core.xml
===================================================================
--- trunk/refman-5.0/language-structure-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/language-structure-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 841 bytes

@@ -368,7 +368,7 @@
         <quote><literal>%</literal></quote> and
         <quote><literal>_</literal></quote> in pattern-matching
contexts
         where they would otherwise be interpreted as wildcard
-        characters. See the description of the <literal>LIKE</literal>
+        characters. See the description of the <function
role="sqlop">LIKE</function>
         operator in <xref linkend="string-comparison-functions"/>. If
         you use <quote><literal>\%</literal></quote> or
         <quote><literal>\_</literal></quote> in
non-pattern-matching


Modified: trunk/refman-5.0/replication-configuration.xml
===================================================================
--- trunk/refman-5.0/replication-configuration.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/replication-configuration.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 831 bytes

@@ -2312,7 +2312,7 @@
           and table name patterns. Patterns can contain the
           <quote><literal>%</literal></quote> and
           <quote><literal>_</literal></quote> wildcard
characters, which
-          have the same meaning as for the <literal>LIKE</literal>
+          have the same meaning as for the <function
role="sqlop">LIKE</function>
           pattern-matching operator. To specify more than one table, use
           this option multiple times, once for each table. This works
           for cross-database updates. See


Modified: trunk/refman-5.0/restrictions.xml
===================================================================
--- trunk/refman-5.0/restrictions.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/restrictions.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 747 bytes

@@ -1514,7 +1514,7 @@
             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 <literal>SLEEP()</literal> on Windows and Linux may
+            call to <function role="sql">SLEEP()</function> on Windows and
Linux may
             differ slightly due to the differences in precision.
           </para>
         </listitem>


Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/sql-syntax.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 18, Lines Added: 20, Lines Deleted: 20; 9075 bytes

@@ -17287,8 +17287,8 @@
 
       <para>
         If the syntax for a given <literal>SHOW</literal> statement
-        includes a <literal>LIKE
-        '<replaceable>pattern</replaceable>'</literal> part,
+        includes a <function role="sqlop" condition="like">LIKE
+        '<replaceable>pattern</replaceable>'</function> part,
         <literal>'<replaceable>pattern</replaceable>'</literal>
is a
         string that can contain the SQL
         <quote><literal>%</literal></quote> and

@@ -17343,7 +17343,7 @@
 
         <para>
           The <literal>SHOW CHARACTER SET</literal> statement shows all
-          available character sets. The <literal>LIKE</literal> clause,
+          available character sets. The <function
role="sqlop">LIKE</function> clause,
           if present, indicates which character set names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -17396,7 +17396,7 @@
 
         <para>
           The output from <literal>SHOW COLLATION</literal> includes all
-          available character sets. The <literal>LIKE</literal> clause,
+          available character sets. The <function
role="sqlop">LIKE</function> clause,
           if present, indicates which collation names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -17468,7 +17468,7 @@
         <para>
           <literal>SHOW COLUMNS</literal> displays information about the
           columns in a given table. It also works for views as of MySQL
-          5.0.1. The <literal>LIKE</literal> clause, if present,
+          5.0.1. The <function role="sqlop">LIKE</function> clause, if
present,
           indicates which column names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -17784,7 +17784,7 @@
           <literal>SHOW DATABASES</literal> lists the databases on the
           MySQL server host. <literal>SHOW SCHEMAS</literal> is a
           synonym for <literal>SHOW DATABASES</literal> as of MySQL
-          5.0.2. The <literal>LIKE</literal> clause, if present,
+          5.0.2. The <function role="sqlop">LIKE</function> clause, if
present,
           indicates which database names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -18586,7 +18586,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          The <literal>LIKE</literal> clause, if present, indicates
+          The <function role="sqlop">LIKE</function> clause, if present,
indicates
           which event names to match. The <literal>WHERE</literal>
           clause can be given to select rows using more general
           conditions, as discussed in <xref linkend="extended-show"/>.

@@ -18887,7 +18887,7 @@
           <literal>SHOW OPEN TABLES</literal> lists the
           non-<literal>TEMPORARY</literal> tables that are currently
           open in the table cache. See <xref linkend="table-cache"/>.
-          The <literal>LIKE</literal> clause, if present, indicates
+          The <function role="sqlop">LIKE</function> clause, if present,
indicates
           which table names to match. The <literal>WHERE</literal>
           clause can be given to select rows using more general
           conditions, as discussed in <xref linkend="extended-show"/>.

@@ -18954,7 +18954,7 @@
         </itemizedlist>
 
         <para>
-          The <literal>FROM</literal> and <literal>LIKE</literal>
+          The <literal>FROM</literal> and <function
role="sqlop">LIKE</function>
           clauses may be used as of MySQL 5.0.12.
         </para>
 

@@ -19148,7 +19148,7 @@
           These statements are MySQL extensions. They return
           characteristics of routines, such as the database, name, type,
           creator, and creation and modification dates. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           procedure or function names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -19788,7 +19788,7 @@
           <literal>SHOW STATUS</literal> provides server status
           information. This information also can be obtained using the
           <command>mysqladmin extended-status</command> command. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           variable names to match. The <literal>WHERE</literal> clause
           can be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -19835,7 +19835,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          With a <literal>LIKE</literal> clause, the statement displays
+          With a <function role="sqlop">LIKE</function> clause, the statement
displays
           only rows for those variables with names that match the
           pattern:
         </para>

@@ -19944,7 +19944,7 @@
           TABLES</literal>, but provides a lot of information about each
           table. You can also get this list using the <command>mysqlshow
           --status <replaceable>db_name</replaceable></command>
command.
-          The <literal>LIKE</literal> clause, if present, indicates
+          The <function role="sqlop">LIKE</function> clause, if present,
indicates
           which table names to match. The <literal>WHERE</literal>
           clause can be given to select rows using more general
           conditions, as discussed in <xref linkend="extended-show"/>.

@@ -20262,7 +20262,7 @@
           non-<literal>TEMPORARY</literal> tables in a given database.
           You can also get this list using the <command>mysqlshow
           <replaceable>db_name</replaceable></command> command. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           table names to match. The <literal>WHERE</literal> clause can
           be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -20327,7 +20327,7 @@
           <literal>SHOW TRIGGERS</literal> lists the triggers currently
           defined on the MySQL server. This statement requires the
           <literal>SUPER</literal> privilege. It was implemented in
-          MySQL 5.0.10. The <literal>LIKE</literal> clause, if present,
+          MySQL 5.0.10. The <function role="sqlop">LIKE</function> clause, if
present,
           indicates which trigger names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -20357,7 +20357,7 @@
 
         <note>
           <para>
-            When using a <literal>LIKE</literal> clause with
+            When using a <function role="sqlop">LIKE</function> clause with
             <literal>SHOW TRIGGERS</literal>, the expression to be
             matched (<replaceable>expr</replaceable>) is compared with
             the name of the table on which the trigger is declared, and

@@ -20524,7 +20524,7 @@
           <literal>SHOW VARIABLES</literal> shows the values of MySQL
           system variables. This information also can be obtained using
           the <command>mysqladmin variables</command> command. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           variable names to match. The <literal>WHERE</literal> clause
           can be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -20607,10 +20607,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          With a <literal>LIKE</literal> clause, the statement displays
+          With a <function role="sqlop">LIKE</function> clause, the statement
displays
           only rows for those variables with names that match the
           pattern. To obtain the row for a specific variable, use a
-          <literal>LIKE</literal> clause as shown:
+          <function role="sqlop">LIKE</function> clause as shown:
         </para>
 
 <programlisting>

@@ -20621,7 +20621,7 @@
         <para>
           To get a list of variables whose name match a pattern, use the
           <quote><literal>%</literal></quote> wildcard character
in a
-          <literal>LIKE</literal> clause:
+          <function role="sqlop">LIKE</function> clause:
         </para>
 
 <programlisting>


Modified: trunk/refman-5.0/tutorial.xml
===================================================================
--- trunk/refman-5.0/tutorial.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.0/tutorial.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 1598 bytes

@@ -2076,8 +2076,8 @@
           MySQL, SQL patterns are case-insensitive by default. Some
           examples are shown here. Note that you do not use
           <literal>=</literal> or
<literal>&lt;&gt;</literal> when you
-          use SQL patterns; use the <literal>LIKE</literal> or
-          <literal>NOT LIKE</literal> comparison operators instead.
+          use SQL patterns; use the <function role="sqlop">LIKE</function> or
+          <function role="sqlop">NOT LIKE</function> comparison operators
instead.
         </para>
 
         <para>

@@ -2197,7 +2197,7 @@
             <para>
               A <function role="sqlop">REGEXP</function> pattern match
               succeeds if the pattern matches anywhere in the value
-              being tested. (This differs from a <literal>LIKE</literal>
+              being tested. (This differs from a <function
role="sqlop">LIKE</function>
               pattern match, which succeeds only if the pattern matches
               the entire value.)
             </para>

@@ -2217,7 +2217,7 @@
 
         <para>
           To demonstrate how extended regular expressions work, the
-          <literal>LIKE</literal> queries shown previously are rewritten
+          <function role="sqlop">LIKE</function> queries shown previously are
rewritten
           here to use <function role="sqlop">REGEXP</function>.
         </para>
 


Modified: trunk/refman-5.1/ccsg-temp.xml
===================================================================
--- trunk/refman-5.1/ccsg-temp.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/ccsg-temp.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 7, Lines Added: 10, Lines Deleted: 10; 4152 bytes

@@ -22791,7 +22791,7 @@
             </para>
 
             <para>
-              Other comparison operators such as <literal>LIKE</literal>
+              Other comparison operators such as <function
role="sqlop">LIKE</function>
               and <literal>BETWEEN ... AND</literal> are likewise
               incompatible with the primary key lookup method. Each
               these operators specifies a range of values; none of them

@@ -23286,7 +23286,7 @@
               comparisons. The radically different organization of
               ordered indexes allows them be used with other comparison
               operators, such as less than, greater than and even
-              <literal>LIKE</literal>. For example, we used the
+              <function role="sqlop">LIKE</function>. For example, we used
the
               following query to illustrate that it could not benefit at
               all from a the hash index:
             </para>

@@ -23342,7 +23342,7 @@
 
               <listitem>
                 <para>
-                  <literal>LIKE</literal>, depending on the pattern that
+                  <function role="sqlop">LIKE</function>, depending on the
pattern that
                   is matched
                 </para>
               </listitem>

@@ -23353,13 +23353,13 @@
               The <literal>... BETWEEN ... AND ...</literal> is
               completely equivalent to a <literal>... &gt;= ... AND ...
               &lt;= ... </literal> expression. The
-              <literal>LIKE</literal> operator is a special case.
+              <function role="sqlop">LIKE</function> operator is a special
case.
             </para>
 
             <para>
-              The <literal>LIKE</literal> operator tests to see if the
+              The <function role="sqlop">LIKE</function> operator tests to
see if the
               value of the string expression appearing on the left hand
-              side of the <literal>LIKE</literal> keyword matches the
+              side of the <function role="sqlop">LIKE</function> keyword
matches the
               pattern appearing on the right hand side. The pattern is
               also a string expression. The string value of the pattern
               is a collection of literal characters and optionally a

@@ -23380,7 +23380,7 @@
               <literal>A</literal> and is followed by zero or more
               arbitrary characters. So the <literal>%</literal>
               character denotes a wildcard that stands for zero or more
-              arbitrary characters. Any <literal>LIKE</literal> pattern
+              arbitrary characters. Any <function
role="sqlop">LIKE</function> pattern
               whose string value does not start with a wildcard can be
               transformed into an range expression, and this is exactly
               what the MySQL Server will do. For example, the previous

@@ -23396,9 +23396,9 @@
 AND    Name        &lt; 'B'</programlisting>
 
             <para>
-              In this particular case of <literal>LIKE</literal> the
+              In this particular case of <function
role="sqlop">LIKE</function> the
               ordered index can be used to perform a range scan. A
-              <literal>LIKE</literal> comparison can not be rewritten to
+              <function role="sqlop">LIKE</function> comparison can not be
rewritten to
               a range expression if it starts with a wildcard. Consider
               the following query:
             </para>

@@ -23412,7 +23412,7 @@
 
             <para>
               Here the pattern starts with the <literal>%</literal>
-              wildcard, and the <literal>LIKE</literal> expression
+              wildcard, and the <function role="sqlop">LIKE</function>
expression
               cannot be optimized to a range expression. However, this
               does not have to mean that ordered index is not used
               anymore. In this particular case, the values supplied for


Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/data-types.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 556 bytes

@@ -4977,7 +4977,7 @@
       <para>
         Normally, you search for <literal>SET</literal> values using the
         <function role="sql">FIND_IN_SET()</function> function or the
-        <literal>LIKE</literal> operator:
+        <function role="sqlop">LIKE</function> operator:
       </para>
 
 <programlisting>


Modified: trunk/refman-5.1/dba-core-new-tmp.xml
===================================================================
--- trunk/refman-5.1/dba-core-new-tmp.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/dba-core-new-tmp.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 6, Lines Added: 7, Lines Deleted: 7; 2899 bytes

@@ -8622,9 +8622,9 @@
       </remark>
 
       <para>
-        With a <literal>LIKE</literal> clause, the statement displays
+        With a <function role="sqlop">LIKE</function> clause, the statement
displays
         only those variables that match the pattern. To obtain a
-        specific variable name, use a <literal>LIKE</literal> clause as
+        specific variable name, use a <function role="sqlop">LIKE</function>
clause as
         shown:
       </para>
 

@@ -8636,7 +8636,7 @@
       <para>
         To get a list of variables whose name match a pattern, use the
         <quote><literal>%</literal></quote> wildcard character in
a
-        <literal>LIKE</literal> clause:
+        <function role="sqlop">LIKE</function> clause:
       </para>
 
 <programlisting>

@@ -8908,7 +8908,7 @@
         <para>
           However, the following statement does not work. The variable
           is not interpreted as a compound name, but as a simple string
-          for a <literal>LIKE</literal> pattern-matching operation:
+          for a <function role="sqlop">LIKE</function> pattern-matching
operation:
         </para>
 
 <programlisting>

@@ -17297,7 +17297,7 @@
             <quote><literal>_</literal></quote> in
             <literal>Host</literal> column values. These have the same
             meaning as for pattern-matching operations performed with
-            the <literal>LIKE</literal> operator. For example, a
+            the <function role="sqlop">LIKE</function> operator. For example,
a
             <literal>Host</literal> value of
<literal>'%'</literal>
             matches any hostname, whereas a value of
             <literal>'%.mysql.com'</literal> matches any host in the

@@ -17822,7 +17822,7 @@
             <literal>Host</literal> and <literal>Db</literal>
columns of
             either table. These have the same meaning as for
             pattern-matching operations performed with the
-            <literal>LIKE</literal> operator. If you want to use either
+            <function role="sqlop">LIKE</function> operator. If you want to
use either
             character literally when granting privileges, you must
             escape it with a backslash. For example, to include the
             underscore character
(<quote><literal>_</literal></quote>)

@@ -17934,7 +17934,7 @@
             and <quote><literal>_</literal></quote> can be used
in the
             <literal>Host</literal> column. These have the same meaning
             as for pattern-matching operations performed with the
-            <literal>LIKE</literal> operator.
+            <function role="sqlop">LIKE</function> operator.
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/dba-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 6, Lines Added: 7, Lines Deleted: 7; 2875 bytes

@@ -8609,9 +8609,9 @@
       </remark>
 
       <para>
-        With a <literal>LIKE</literal> clause, the statement displays
+        With a <function role="sqlop">LIKE</function> clause, the statement
displays
         only those variables that match the pattern. To obtain a
-        specific variable name, use a <literal>LIKE</literal> clause as
+        specific variable name, use a <function role="sqlop">LIKE</function>
clause as
         shown:
       </para>
 

@@ -8623,7 +8623,7 @@
       <para>
         To get a list of variables whose name match a pattern, use the
         <quote><literal>%</literal></quote> wildcard character in
a
-        <literal>LIKE</literal> clause:
+        <function role="sqlop">LIKE</function> clause:
       </para>
 
 <programlisting>

@@ -8895,7 +8895,7 @@
         <para>
           However, the following statement does not work. The variable
           is not interpreted as a compound name, but as a simple string
-          for a <literal>LIKE</literal> pattern-matching operation:
+          for a <function role="sqlop">LIKE</function> pattern-matching
operation:
         </para>
 
 <programlisting>

@@ -17363,7 +17363,7 @@
             <quote><literal>_</literal></quote> in
             <literal>Host</literal> column values. These have the same
             meaning as for pattern-matching operations performed with
-            the <literal>LIKE</literal> operator. For example, a
+            the <function role="sqlop">LIKE</function> operator. For example,
a
             <literal>Host</literal> value of
<literal>'%'</literal>
             matches any hostname, whereas a value of
             <literal>'%.mysql.com'</literal> matches any host in the

@@ -17888,7 +17888,7 @@
             <literal>Host</literal> and <literal>Db</literal>
columns of
             either table. These have the same meaning as for
             pattern-matching operations performed with the
-            <literal>LIKE</literal> operator. If you want to use either
+            <function role="sqlop">LIKE</function> operator. If you want to
use either
             character literally when granting privileges, you must
             escape it with a backslash. For example, to include the
             underscore character
(<quote><literal>_</literal></quote>)

@@ -18000,7 +18000,7 @@
             and <quote><literal>_</literal></quote> can be used
in the
             <literal>Host</literal> column. These have the same meaning
             as for pattern-matching operations performed with the
-            <literal>LIKE</literal> operator.
+            <function role="sqlop">LIKE</function> operator.
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/errors-problems-core.xml
===================================================================
--- trunk/refman-5.1/errors-problems-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/errors-problems-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 684 bytes

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


Modified: trunk/refman-5.1/faqs.xml
===================================================================
--- trunk/refman-5.1/faqs.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/faqs.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 4; 1512 bytes

@@ -6129,7 +6129,7 @@
           </indexterm>
 
           <para>
-            Why do some <literal>LIKE</literal> and
+            Why do some <function role="sqlop">LIKE</function> and
             <literal>FULLTEXT</literal> searches with CJK characters
             fail?
           </para>

@@ -6139,7 +6139,7 @@
         <answer>
 
           <para>
-            There is a very simple problem with <literal>LIKE</literal>
+            There is a very simple problem with <function
role="sqlop">LIKE</function>
             searches on <literal>BINARY</literal> and
             <literal>BLOB</literal> columns: we need to know the end of
             a character. With multi-byte character sets, different

@@ -6159,8 +6159,9 @@
 
             If we don't know where the first character ends, then we
             don't know where the second character begins, in which case
-            even very simple searches such as <literal>LIKE
-            '_A%'</literal> fail. The solution is to use a regular CJK
+            even very simple searches such as <function role="sqlop"
+condition="like">LIKE
+            '_A%'</function> fail. The solution is to use a regular CJK
             character set in the first place, or to convert to a CJK
             character set before comparing.
           </para>


Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/functions-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 13, Lines Added: 18, Lines Deleted: 18; 5520 bytes

@@ -1718,7 +1718,7 @@
               <secondary>logical</secondary>
             </indexterm>
 
-            <literal>XOR</literal>
+            <function role="sqlop">XOR</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -3734,8 +3734,8 @@
             <primary>SOUNDS LIKE</primary>
           </indexterm>
 
-          <literal><replaceable>expr1</replaceable> SOUNDS LIKE
-          <replaceable>expr2</replaceable></literal>
+          <function role="sqlop"
condition="sounds-like"><replaceable>expr1</replaceable> SOUNDS LIKE
+          <replaceable>expr2</replaceable></function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -4197,9 +4197,9 @@
               <primary>LIKE</primary>
             </indexterm>
 
-            <literal><replaceable>expr</replaceable> LIKE
+            <function role="sqlop"
condition="like"><replaceable>expr</replaceable> LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape_char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -4224,7 +4224,7 @@
           <remark role="help-description-end"/>
 
           <para>
-            Per the SQL standard, <literal>LIKE</literal> performs
+            Per the SQL standard, <function role="sqlop">LIKE</function>
performs
             matching on a per-character basis, thus it can produce
             results different from the
             <function role="sqlop" condition="equal">=</function>

@@ -4247,7 +4247,7 @@
 </programlisting>
 
           <para>
-            With <literal>LIKE</literal> you can use the following two
+            With <function role="sqlop">LIKE</function> you can use the
following two
             wildcard characters in the pattern:
           </para>
 

@@ -4347,9 +4347,9 @@
 </programlisting>
 
           <para>
-            In MySQL, <literal>LIKE</literal> is allowed on numeric
+            In MySQL, <function role="sqlop">LIKE</function> is allowed on
numeric
             expressions. (This is an extension to the standard SQL
-            <literal>LIKE</literal>.)
+            <function role="sqlop">LIKE</function>.)
           </para>
 
 <programlisting>

@@ -4363,7 +4363,7 @@
               example, <quote><literal>\n</literal></quote> to
represent
               a newline character), you must double any
               <quote><literal>\</literal></quote> that you use in
-              <literal>LIKE</literal> strings. For example, to search
+              <function role="sqlop">LIKE</function> strings. For example, to
search
               for <quote><literal>\n</literal></quote>, specify
it as
               <quote><literal>\\n</literal></quote>. To search
for
               <quote><literal>\</literal></quote>, specify it as

@@ -4389,9 +4389,9 @@
               <primary>NOT LIKE</primary>
             </indexterm>
 
-            <literal><replaceable>expr</replaceable> NOT LIKE
+            <function role="sqlop"
condition="not-like"><replaceable>expr</replaceable> NOT LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape_char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -4409,7 +4409,7 @@
 
           <note>
             <para>
-              Aggegate queries involving <literal>NOT LIKE</literal>
+              Aggegate queries involving <function role="sqlop">NOT
LIKE</function>
               comparisons with columns containing
               <literal>NULL</literal> may yield unexpected results. For
               example, consider the following table and data:

@@ -10720,10 +10720,10 @@
     <remark role="help-syntax"/>
 
     <para id="function_match">
-      <literal>MATCH
+      <function role="sql" condition="match">MATCH
      
(<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
       AGAINST (<replaceable>expr</replaceable>
-      [<replaceable>search_modifier</replaceable>])</literal>
+      [<replaceable>search_modifier</replaceable>])</function>
     </para>
 
 <programlisting>

@@ -13002,7 +13002,7 @@
       To perform a case-insensitive comparison, use the
       <function role="sql">CONVERT()</function> function to convert the
       value to a non-binary string. If the character set of the result
-      has a case-insensitive collation, the <literal>LIKE</literal>
+      has a case-insensitive collation, the <function
role="sqlop">LIKE</function>
       operation is not case sensitive:
     </para>
 

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

@@ -17238,7 +17238,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Returns the bitwise <literal>XOR</literal> of all bits in
+            Returns the bitwise <function role="sqlop">XOR</function> of all
bits in
             <replaceable>expr</replaceable>. The calculation is
             performed with 64-bit (<literal>BIGINT</literal>) precision.
           </para>


Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/information-schema.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 666 bytes

@@ -5869,7 +5869,7 @@
 
     <para>
       <literal>SHOW</literal> statements that accept a
-      <literal>LIKE</literal> clause to limit the rows displayed also
+      <function role="sqlop">LIKE</function> clause to limit the rows
displayed also
       allow a <literal>WHERE</literal> clause that enables specification
       of more general conditions that selected rows must satisfy:
     </para>


Modified: trunk/refman-5.1/internationalization.xml
===================================================================
--- trunk/refman-5.1/internationalization.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/internationalization.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1041 bytes

@@ -2692,7 +2692,7 @@
         <para>
           The <literal>SHOW CHARACTER SET</literal> command shows all
           available character sets. It takes an optional
-          <literal>LIKE</literal> clause that indicates which character
+          <function role="sqlop">LIKE</function> clause that indicates which
character
           set names to match. For example:
         </para>
 

@@ -2711,7 +2711,7 @@
         <para>
           The output from <literal>SHOW COLLATION</literal> includes all
           available character sets. It takes an optional
-          <literal>LIKE</literal> clause that indicates which collation
+          <function role="sqlop">LIKE</function> clause that indicates which
collation
           names to match. For example:
         </para>
 


Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/introduction.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 522 bytes

@@ -1707,7 +1707,7 @@
 
             <listitem>
               <para>
-                <literal>LIKE</literal> is allowed on numeric values.
+                <function role="sqlop">LIKE</function> is allowed on numeric
values.
               </para>
             </listitem>
 


Modified: trunk/refman-5.1/language-structure-core.xml
===================================================================
--- trunk/refman-5.1/language-structure-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/language-structure-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 841 bytes

@@ -366,7 +366,7 @@
         <quote><literal>%</literal></quote> and
         <quote><literal>_</literal></quote> in pattern-matching
contexts
         where they would otherwise be interpreted as wildcard
-        characters. See the description of the <literal>LIKE</literal>
+        characters. See the description of the <function
role="sqlop">LIKE</function>
         operator in <xref linkend="string-comparison-functions"/>. If
         you use <quote><literal>\%</literal></quote> or
         <quote><literal>\_</literal></quote> in
non-pattern-matching


Modified: trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1436 bytes

@@ -14174,8 +14174,8 @@
           <note>
             <para>
               In MySQL 5.1, this statement no longer supports a
-              <literal>LIKE</literal> clause. However, you can use
-              <literal>LIKE</literal> to filter queries against the
+              <function role="sqlop">LIKE</function> clause. However, you can
use
+              <function role="sqlop">LIKE</function> to filter queries
against the
               <literal>INFORMATION_SCHEMA.ENGINES</literal>, as
               discussed in the next item.
             </para>

@@ -14199,7 +14199,7 @@
             <literal>INFORMATION_SCHEMA</literal> database (available
             beginning with MySQL 5.1.5). Unlike the case with the
             <literal>SHOW ENGINES</literal> statement, it is possible to
-            filter the results using a <literal>LIKE</literal> clause,
+            filter the results using a <function role="sqlop">LIKE</function>
clause,
             and to select specific columns to obtain information that
             may be of use in scripts. For example, the following query
             shows whether the server was built with


Modified: trunk/refman-5.1/mysql-cluster-management.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-management.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/mysql-cluster-management.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 3; 1408 bytes

@@ -2535,8 +2535,8 @@
         <note>
           <para>
             In MySQL 5.1, this statement no longer supports a
-            <literal>LIKE</literal> clause. However, you can use
-            <literal>LIKE</literal> to filter queries against the
+            <function role="sqlop">LIKE</function> clause. However, you can
use
+            <function role="sqlop">LIKE</function> to filter queries against
the
             <literal>INFORMATION_SCHEMA.ENGINES</literal>, as discussed
             in the next item.
           </para>

@@ -2560,7 +2560,7 @@
           <literal>INFORMATION_SCHEMA</literal> database (available
           beginning with MySQL 5.1.5). Unlike the case with the
           <literal>SHOW ENGINES</literal> statement, it is possible to
-          filter the results using a <literal>LIKE</literal> clause, and
+          filter the results using a <function role="sqlop">LIKE</function>
clause, and
           to select specific columns to obtain information that may be
           of use in scripts. For example, the following query shows
           whether the server was built with <literal>NDB</literal>


Modified: trunk/refman-5.1/partitioning-guide.xml
===================================================================
--- trunk/refman-5.1/partitioning-guide.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/partitioning-guide.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 841 bytes

@@ -4032,7 +4032,7 @@
             output of <literal>SHOW TABLE STATUS</literal>, with the
             addition of columns showing the data and index directories
             used for the partition. This command is likely to support
-            <literal>LIKE</literal> and <literal>FROM</literal>
clauses
+            <function role="sqlop">LIKE</function> and
<literal>FROM</literal> clauses
             that will make it possible to obtain information about a
             given partition by name, or about partitions belonging to
             specific table or database.


Modified: trunk/refman-5.1/replication-configuration.xml
===================================================================
--- trunk/refman-5.1/replication-configuration.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/replication-configuration.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 831 bytes

@@ -2867,7 +2867,7 @@
           and table name patterns. Patterns can contain the
           <quote><literal>%</literal></quote> and
           <quote><literal>_</literal></quote> wildcard
characters, which
-          have the same meaning as for the <literal>LIKE</literal>
+          have the same meaning as for the <function
role="sqlop">LIKE</function>
           pattern-matching operator. To specify more than one table, use
           this option multiple times, once for each table. This works
           for cross-database updates. See


Modified: trunk/refman-5.1/restrictions.xml
===================================================================
--- trunk/refman-5.1/restrictions.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/restrictions.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 747 bytes

@@ -1553,7 +1553,7 @@
             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 <literal>SLEEP()</literal> on Windows and Linux may
+            call to <function role="sql">SLEEP()</function> on Windows and
Linux may
             differ slightly due to the differences in precision.
           </para>
         </listitem>


Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/sql-syntax.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 18, Lines Added: 20, Lines Deleted: 20; 9135 bytes

@@ -19666,8 +19666,8 @@
 
       <para>
         If the syntax for a given <literal>SHOW</literal> statement
-        includes a <literal>LIKE
-        '<replaceable>pattern</replaceable>'</literal> part,
+        includes a <function role="sqlop" condition="like">LIKE
+        '<replaceable>pattern</replaceable>'</function> part,
         <literal>'<replaceable>pattern</replaceable>'</literal>
is a
         string that can contain the SQL
         <quote><literal>%</literal></quote> and

@@ -19760,7 +19760,7 @@
 
         <para>
           The <literal>SHOW CHARACTER SET</literal> statement shows all
-          available character sets. The <literal>LIKE</literal> clause,
+          available character sets. The <function
role="sqlop">LIKE</function> clause,
           if present, indicates which character set names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -19813,7 +19813,7 @@
 
         <para>
           The output from <literal>SHOW COLLATION</literal> includes all
-          available character sets. The <literal>LIKE</literal> clause,
+          available character sets. The <function
role="sqlop">LIKE</function> clause,
           if present, indicates which collation names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -19885,7 +19885,7 @@
         <para>
           <literal>SHOW COLUMNS</literal> displays information about the
           columns in a given table. It also works for views. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           column names to match. The <literal>WHERE</literal> clause can
           be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -20377,7 +20377,7 @@
           <literal>SHOW DATABASES</literal> lists the databases on the
           MySQL server host. <literal>SHOW SCHEMAS</literal> is a
           synonym for <literal>SHOW DATABASES</literal>. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           database names to match. The <literal>WHERE</literal> clause
           can be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -21195,7 +21195,7 @@
 </programlisting>
 
         <para>
-          The <literal>LIKE</literal> clause, if present, indicates
+          The <function role="sqlop">LIKE</function> clause, if present,
indicates
           which event names to match. The <literal>WHERE</literal>
           clause can be given to select rows using more general
           conditions, as discussed in <xref linkend="extended-show"/>.

@@ -21402,7 +21402,7 @@
 
         <para>
           You can filter the list returned by this statement on the
-          event name using <literal>LIKE</literal> plus a pattern.
+          event name using <function role="sqlop">LIKE</function> plus a
pattern.
         </para>
 
         <para>

@@ -21802,7 +21802,7 @@
           <literal>SHOW OPEN TABLES</literal> lists the
           non-<literal>TEMPORARY</literal> tables that are currently
           open in the table cache. See <xref linkend="table-cache"/>.
-          The <literal>LIKE</literal> clause, if present, indicates
+          The <function role="sqlop">LIKE</function> clause, if present,
indicates
           which table names to match. The <literal>WHERE</literal>
           clause can be given to select rows using more general
           conditions, as discussed in <xref linkend="extended-show"/>.

@@ -22112,7 +22112,7 @@
           These statements are MySQL extensions. They return
           characteristics of routines, such as the database, name, type,
           creator, creation and modification dates, and character set
-          information. The <literal>LIKE</literal> clause, if present,
+          information. The <function role="sqlop">LIKE</function> clause, if
present,
           indicates which procedure or function names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -22534,7 +22534,7 @@
           <literal>SHOW STATUS</literal> provides server status
           information. This information also can be obtained using the
           <command>mysqladmin extended-status</command> command. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           variable names to match. The <literal>WHERE</literal> clause
           can be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -22581,7 +22581,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          With a <literal>LIKE</literal> clause, the statement displays
+          With a <function role="sqlop">LIKE</function> clause, the statement
displays
           only rows for those variables with names that match the
           pattern:
         </para>

@@ -22673,7 +22673,7 @@
           TABLES</literal>, but provides a lot of information about each
           table. You can also get this list using the <command>mysqlshow
           --status <replaceable>db_name</replaceable></command>
command.
-          The <literal>LIKE</literal> clause, if present, indicates
+          The <function role="sqlop">LIKE</function> clause, if present,
indicates
           which table names to match. The <literal>WHERE</literal>
           clause can be given to select rows using more general
           conditions, as discussed in <xref linkend="extended-show"/>.

@@ -22987,7 +22987,7 @@
           non-<literal>TEMPORARY</literal> tables in a given database.
           You can also get this list using the <command>mysqlshow
           <replaceable>db_name</replaceable></command> command. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           table names to match. The <literal>WHERE</literal> clause can
           be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -23050,7 +23050,7 @@
           defined on the MySQL server. This statement requires the
           <literal>TRIGGER</literal> privilege (prior to MySQL 5.1.22,
           it requires the <literal>SUPER</literal> privilege). The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           trigger names to match. The <literal>WHERE</literal> clause
           can be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -23094,7 +23094,7 @@
 
         <note>
           <para>
-            When using a <literal>LIKE</literal> clause with
+            When using a <function role="sqlop">LIKE</function> clause with
             <literal>SHOW TRIGGERS</literal>, the expression to be
             matched (<replaceable>expr</replaceable>) is compared with
             the name of the table on which the trigger is declared, and

@@ -23254,7 +23254,7 @@
           <literal>SHOW VARIABLES</literal> shows the values of MySQL
           system variables. This information also can be obtained using
           the <command>mysqladmin variables</command> command. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           variable names to match. The <literal>WHERE</literal> clause
           can be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -23345,10 +23345,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          With a <literal>LIKE</literal> clause, the statement displays
+          With a <function role="sqlop">LIKE</function> clause, the statement
displays
           only rows for those variables with names that match the
           pattern. To obtain the row for a specific variable, use a
-          <literal>LIKE</literal> clause as shown:
+          <function role="sqlop">LIKE</function> clause as shown:
         </para>
 
 <programlisting>

@@ -23359,7 +23359,7 @@
         <para>
           To get a list of variables whose name match a pattern, use the
           <quote><literal>%</literal></quote> wildcard character
in a
-          <literal>LIKE</literal> clause:
+          <function role="sqlop">LIKE</function> clause:
         </para>
 
 <programlisting>


Modified: trunk/refman-5.1/tutorial.xml
===================================================================
--- trunk/refman-5.1/tutorial.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-5.1/tutorial.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 1598 bytes

@@ -2065,8 +2065,8 @@
           MySQL, SQL patterns are case-insensitive by default. Some
           examples are shown here. Note that you do not use
           <literal>=</literal> or
<literal>&lt;&gt;</literal> when you
-          use SQL patterns; use the <literal>LIKE</literal> or
-          <literal>NOT LIKE</literal> comparison operators instead.
+          use SQL patterns; use the <function role="sqlop">LIKE</function> or
+          <function role="sqlop">NOT LIKE</function> comparison operators
instead.
         </para>
 
         <para>

@@ -2186,7 +2186,7 @@
             <para>
               A <function role="sqlop">REGEXP</function> pattern match
               succeeds if the pattern matches anywhere in the value
-              being tested. (This differs from a <literal>LIKE</literal>
+              being tested. (This differs from a <function
role="sqlop">LIKE</function>
               pattern match, which succeeds only if the pattern matches
               the entire value.)
             </para>

@@ -2206,7 +2206,7 @@
 
         <para>
           To demonstrate how extended regular expressions work, the
-          <literal>LIKE</literal> queries shown previously are rewritten
+          <function role="sqlop">LIKE</function> queries shown previously are
rewritten
           here to use <function role="sqlop">REGEXP</function>.
         </para>
 


Modified: trunk/refman-6.0/data-types.xml
===================================================================
--- trunk/refman-6.0/data-types.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/data-types.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 556 bytes

@@ -4970,7 +4970,7 @@
       <para>
         Normally, you search for <literal>SET</literal> values using the
         <function role="sql">FIND_IN_SET()</function> function or the
-        <literal>LIKE</literal> operator:
+        <function role="sqlop">LIKE</function> operator:
       </para>
 
 <programlisting>


Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/dba-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 6, Lines Added: 7, Lines Deleted: 7; 2875 bytes

@@ -8307,9 +8307,9 @@
       </remark>
 
       <para>
-        With a <literal>LIKE</literal> clause, the statement displays
+        With a <function role="sqlop">LIKE</function> clause, the statement
displays
         only those variables that match the pattern. To obtain a
-        specific variable name, use a <literal>LIKE</literal> clause as
+        specific variable name, use a <function role="sqlop">LIKE</function>
clause as
         shown:
       </para>
 

@@ -8321,7 +8321,7 @@
       <para>
         To get a list of variables whose name match a pattern, use the
         <quote><literal>%</literal></quote> wildcard character in
a
-        <literal>LIKE</literal> clause:
+        <function role="sqlop">LIKE</function> clause:
       </para>
 
 <programlisting>

@@ -8593,7 +8593,7 @@
         <para>
           However, the following statement does not work. The variable
           is not interpreted as a compound name, but as a simple string
-          for a <literal>LIKE</literal> pattern-matching operation:
+          for a <function role="sqlop">LIKE</function> pattern-matching
operation:
         </para>
 
 <programlisting>

@@ -16894,7 +16894,7 @@
             <quote><literal>_</literal></quote> in
             <literal>Host</literal> column values. These have the same
             meaning as for pattern-matching operations performed with
-            the <literal>LIKE</literal> operator. For example, a
+            the <function role="sqlop">LIKE</function> operator. For example,
a
             <literal>Host</literal> value of
<literal>'%'</literal>
             matches any hostname, whereas a value of
             <literal>'%.mysql.com'</literal> matches any host in the

@@ -17419,7 +17419,7 @@
             <literal>Host</literal> and <literal>Db</literal>
columns of
             either table. These have the same meaning as for
             pattern-matching operations performed with the
-            <literal>LIKE</literal> operator. If you want to use either
+            <function role="sqlop">LIKE</function> operator. If you want to
use either
             character literally when granting privileges, you must
             escape it with a backslash. For example, to include the
             underscore character
(<quote><literal>_</literal></quote>)

@@ -17531,7 +17531,7 @@
             and <quote><literal>_</literal></quote> can be used
in the
             <literal>Host</literal> column. These have the same meaning
             as for pattern-matching operations performed with the
-            <literal>LIKE</literal> operator.
+            <function role="sqlop">LIKE</function> operator.
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/errors-problems.xml
===================================================================
--- trunk/refman-6.0/errors-problems.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/errors-problems.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 669 bytes

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


Modified: trunk/refman-6.0/faqs.xml
===================================================================
--- trunk/refman-6.0/faqs.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/faqs.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 4; 1512 bytes

@@ -6131,7 +6131,7 @@
           </indexterm>
 
           <para>
-            Why do some <literal>LIKE</literal> and
+            Why do some <function role="sqlop">LIKE</function> and
             <literal>FULLTEXT</literal> searches with CJK characters
             fail?
           </para>

@@ -6141,7 +6141,7 @@
         <answer>
 
           <para>
-            There is a very simple problem with <literal>LIKE</literal>
+            There is a very simple problem with <function
role="sqlop">LIKE</function>
             searches on <literal>BINARY</literal> and
             <literal>BLOB</literal> columns: we need to know the end of
             a character. With multi-byte character sets, different

@@ -6161,8 +6161,9 @@
 
             If we don't know where the first character ends, then we
             don't know where the second character begins, in which case
-            even very simple searches such as <literal>LIKE
-            '_A%'</literal> fail. The solution is to use a regular CJK
+            even very simple searches such as <function role="sqlop"
+condition="like">LIKE
+            '_A%'</function> fail. The solution is to use a regular CJK
             character set in the first place, or to convert to a CJK
             character set before comparing.
           </para>


Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/functions-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 13, Lines Added: 18, Lines Deleted: 18; 5520 bytes

@@ -1718,7 +1718,7 @@
               <secondary>logical</secondary>
             </indexterm>
 
-            <literal>XOR</literal>
+            <function role="sqlop">XOR</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -3733,8 +3733,8 @@
             <primary>SOUNDS LIKE</primary>
           </indexterm>
 
-          <literal><replaceable>expr1</replaceable> SOUNDS LIKE
-          <replaceable>expr2</replaceable></literal>
+          <function role="sqlop"
condition="sounds-like"><replaceable>expr1</replaceable> SOUNDS LIKE
+          <replaceable>expr2</replaceable></function>
         </para>
 
         <remark role="help-syntax-end"/>

@@ -4534,9 +4534,9 @@
               <primary>LIKE</primary>
             </indexterm>
 
-            <literal><replaceable>expr</replaceable> LIKE
+            <function role="sqlop"
condition="like"><replaceable>expr</replaceable> LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape_char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -4561,7 +4561,7 @@
           <remark role="help-description-end"/>
 
           <para>
-            Per the SQL standard, <literal>LIKE</literal> performs
+            Per the SQL standard, <function role="sqlop">LIKE</function>
performs
             matching on a per-character basis, thus it can produce
             results different from the
             <function role="sqlop" condition="equal">=</function>

@@ -4584,7 +4584,7 @@
 </programlisting>
 
           <para>
-            With <literal>LIKE</literal> you can use the following two
+            With <function role="sqlop">LIKE</function> you can use the
following two
             wildcard characters in the pattern:
           </para>
 

@@ -4683,9 +4683,9 @@
 </programlisting>
 
           <para>
-            In MySQL, <literal>LIKE</literal> is allowed on numeric
+            In MySQL, <function role="sqlop">LIKE</function> is allowed on
numeric
             expressions. (This is an extension to the standard SQL
-            <literal>LIKE</literal>.)
+            <function role="sqlop">LIKE</function>.)
           </para>
 
 <programlisting>

@@ -4699,7 +4699,7 @@
               example, <quote><literal>\n</literal></quote> to
represent
               a newline character), you must double any
               <quote><literal>\</literal></quote> that you use in
-              <literal>LIKE</literal> strings. For example, to search
+              <function role="sqlop">LIKE</function> strings. For example, to
search
               for <quote><literal>\n</literal></quote>, specify
it as
               <quote><literal>\\n</literal></quote>. To search
for
               <quote><literal>\</literal></quote>, specify it as

@@ -4725,9 +4725,9 @@
               <primary>NOT LIKE</primary>
             </indexterm>
 
-            <literal><replaceable>expr</replaceable> NOT LIKE
+            <function role="sqlop"
condition="not-like"><replaceable>expr</replaceable> NOT LIKE
             <replaceable>pat</replaceable> [ESCAPE
-            '<replaceable>escape_char</replaceable>']</literal>
+            '<replaceable>escape_char</replaceable>']</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -4745,7 +4745,7 @@
 
           <note>
             <para>
-              Aggegate queries involving <literal>NOT LIKE</literal>
+              Aggegate queries involving <function role="sqlop">NOT
LIKE</function>
               comparisons with columns containing
               <literal>NULL</literal> may yield unexpected results. For
               example, consider the following table and data:

@@ -11043,10 +11043,10 @@
     <remark role="help-syntax"/>
 
     <para id="function_match">
-      <literal>MATCH
+      <function role="sql" condition="match">MATCH
      
(<replaceable>col1</replaceable>,<replaceable>col2</replaceable>,...)
       AGAINST (<replaceable>expr</replaceable>
-      [<replaceable>search_modifier</replaceable>])</literal>
+      [<replaceable>search_modifier</replaceable>])</function>
     </para>
 
 <programlisting>

@@ -13326,7 +13326,7 @@
       To perform a case-insensitive comparison, use the
       <function role="sql">CONVERT()</function> function to convert the
       value to a non-binary string. If the character set of the result
-      has a case-insensitive collation, the <literal>LIKE</literal>
+      has a case-insensitive collation, the <function
role="sqlop">LIKE</function>
       operation is not case sensitive:
     </para>
 

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

@@ -17540,7 +17540,7 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Returns the bitwise <literal>XOR</literal> of all bits in
+            Returns the bitwise <function role="sqlop">XOR</function> of all
bits in
             <replaceable>expr</replaceable>. The calculation is
             performed with 64-bit (<literal>BIGINT</literal>) precision.
           </para>


Modified: trunk/refman-6.0/information-schema.xml
===================================================================
--- trunk/refman-6.0/information-schema.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/information-schema.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 666 bytes

@@ -6017,7 +6017,7 @@
 
     <para>
       <literal>SHOW</literal> statements that accept a
-      <literal>LIKE</literal> clause to limit the rows displayed also
+      <function role="sqlop">LIKE</function> clause to limit the rows
displayed also
       allow a <literal>WHERE</literal> clause that enables specification
       of more general conditions that selected rows must satisfy:
     </para>


Modified: trunk/refman-6.0/internationalization.xml
===================================================================
--- trunk/refman-6.0/internationalization.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/internationalization.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1041 bytes

@@ -2693,7 +2693,7 @@
         <para>
           The <literal>SHOW CHARACTER SET</literal> command shows all
           available character sets. It takes an optional
-          <literal>LIKE</literal> clause that indicates which character
+          <function role="sqlop">LIKE</function> clause that indicates which
character
           set names to match. For example:
         </para>
 

@@ -2712,7 +2712,7 @@
         <para>
           The output from <literal>SHOW COLLATION</literal> includes all
           available character sets. It takes an optional
-          <literal>LIKE</literal> clause that indicates which collation
+          <function role="sqlop">LIKE</function> clause that indicates which
collation
           names to match. For example:
         </para>
 


Modified: trunk/refman-6.0/introduction.xml
===================================================================
--- trunk/refman-6.0/introduction.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/introduction.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 522 bytes

@@ -1461,7 +1461,7 @@
 
             <listitem>
               <para>
-                <literal>LIKE</literal> is allowed on numeric values.
+                <function role="sqlop">LIKE</function> is allowed on numeric
values.
               </para>
             </listitem>
 


Modified: trunk/refman-6.0/language-structure-core.xml
===================================================================
--- trunk/refman-6.0/language-structure-core.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/language-structure-core.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 841 bytes

@@ -366,7 +366,7 @@
         <quote><literal>%</literal></quote> and
         <quote><literal>_</literal></quote> in pattern-matching
contexts
         where they would otherwise be interpreted as wildcard
-        characters. See the description of the <literal>LIKE</literal>
+        characters. See the description of the <function
role="sqlop">LIKE</function>
         operator in <xref linkend="string-comparison-functions"/>. If
         you use <quote><literal>\%</literal></quote> or
         <quote><literal>\_</literal></quote> in
non-pattern-matching


Modified: trunk/refman-6.0/mysql-cluster-management.xml
===================================================================
--- trunk/refman-6.0/mysql-cluster-management.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/mysql-cluster-management.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 881 bytes

@@ -2530,7 +2530,7 @@
           <literal>INFORMATION_SCHEMA</literal> database (available
           beginning with MySQL 5.1.5). Unlike the case with the
           <literal>SHOW ENGINES</literal> statement, it is possible to
-          filter the results using a <literal>LIKE</literal> clause, and
+          filter the results using a <function role="sqlop">LIKE</function>
clause, and
           to select specific columns to obtain information that may be
           of use in scripts. For example, the following query shows
           whether the server was built with <literal>NDB</literal>


Modified: trunk/refman-6.0/partitioning-guide.xml
===================================================================
--- trunk/refman-6.0/partitioning-guide.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/partitioning-guide.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 841 bytes

@@ -3955,7 +3955,7 @@
             output of <literal>SHOW TABLE STATUS</literal>, with the
             addition of columns showing the data and index directories
             used for the partition. This command is likely to support
-            <literal>LIKE</literal> and <literal>FROM</literal>
clauses
+            <function role="sqlop">LIKE</function> and
<literal>FROM</literal> clauses
             that will make it possible to obtain information about a
             given partition by name, or about partitions belonging to
             specific table or database.


Modified: trunk/refman-6.0/replication-configuration.xml
===================================================================
--- trunk/refman-6.0/replication-configuration.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/replication-configuration.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 831 bytes

@@ -2840,7 +2840,7 @@
           and table name patterns. Patterns can contain the
           <quote><literal>%</literal></quote> and
           <quote><literal>_</literal></quote> wildcard
characters, which
-          have the same meaning as for the <literal>LIKE</literal>
+          have the same meaning as for the <function
role="sqlop">LIKE</function>
           pattern-matching operator. To specify more than one table, use
           this option multiple times, once for each table. This works
           for cross-database updates. See


Modified: trunk/refman-6.0/restrictions.xml
===================================================================
--- trunk/refman-6.0/restrictions.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/restrictions.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 747 bytes

@@ -1524,7 +1524,7 @@
             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 <literal>SLEEP()</literal> on Windows and Linux may
+            call to <function role="sql">SLEEP()</function> on Windows and
Linux may
             differ slightly due to the differences in precision.
           </para>
         </listitem>


Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/sql-syntax.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 18, Lines Added: 20, Lines Deleted: 20; 9121 bytes

@@ -20087,8 +20087,8 @@
 
       <para>
         If the syntax for a given <literal>SHOW</literal> statement
-        includes a <literal>LIKE
-        '<replaceable>pattern</replaceable>'</literal> part,
+        includes a <function role="sqlop" condition="like">LIKE
+        '<replaceable>pattern</replaceable>'</function> part,
         <literal>'<replaceable>pattern</replaceable>'</literal>
is a
         string that can contain the SQL
         <quote><literal>%</literal></quote> and

@@ -20177,7 +20177,7 @@
 
         <para>
           The <literal>SHOW CHARACTER SET</literal> statement shows all
-          available character sets. The <literal>LIKE</literal> clause,
+          available character sets. The <function
role="sqlop">LIKE</function> clause,
           if present, indicates which character set names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -20230,7 +20230,7 @@
 
         <para>
           The output from <literal>SHOW COLLATION</literal> includes all
-          available character sets. The <literal>LIKE</literal> clause,
+          available character sets. The <function
role="sqlop">LIKE</function> clause,
           if present, indicates which collation names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -20302,7 +20302,7 @@
         <para>
           <literal>SHOW COLUMNS</literal> displays information about the
           columns in a given table. It also works for views. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           column names to match. The <literal>WHERE</literal> clause can
           be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -20779,7 +20779,7 @@
           <literal>SHOW DATABASES</literal> lists the databases on the
           MySQL server host. <literal>SHOW SCHEMAS</literal> is a
           synonym for <literal>SHOW DATABASES</literal>. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           database names to match. The <literal>WHERE</literal> clause
           can be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -21523,7 +21523,7 @@
 </programlisting>
 
         <para>
-          The <literal>LIKE</literal> clause, if present, indicates
+          The <function role="sqlop">LIKE</function> clause, if present,
indicates
           which event names to match. The <literal>WHERE</literal>
           clause can be given to select rows using more general
           conditions, as discussed in <xref linkend="extended-show"/>.

@@ -21714,7 +21714,7 @@
 
         <para>
           You can filter the list returned by this statement on the
-          event name using <literal>LIKE</literal> plus a pattern.
+          event name using <function role="sqlop">LIKE</function> plus a
pattern.
         </para>
 
         <para>

@@ -22110,7 +22110,7 @@
           <literal>SHOW OPEN TABLES</literal> lists the
           non-<literal>TEMPORARY</literal> tables that are currently
           open in the table cache. See <xref linkend="table-cache"/>.
-          The <literal>LIKE</literal> clause, if present, indicates
+          The <function role="sqlop">LIKE</function> clause, if present,
indicates
           which table names to match. The <literal>WHERE</literal>
           clause can be given to select rows using more general
           conditions, as discussed in <xref linkend="extended-show"/>.

@@ -22409,7 +22409,7 @@
           These statements are MySQL extensions. They return
           characteristics of routines, such as the database, name, type,
           creator, creation and modification dates, and character set
-          information. The <literal>LIKE</literal> clause, if present,
+          information. The <function role="sqlop">LIKE</function> clause, if
present,
           indicates which procedure or function names to match. The
           <literal>WHERE</literal> clause can be given to select rows
           using more general conditions, as discussed in

@@ -22768,7 +22768,7 @@
           <literal>SHOW STATUS</literal> provides server status
           information. This information also can be obtained using the
           <command>mysqladmin extended-status</command> command. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           variable names to match. The <literal>WHERE</literal> clause
           can be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -22815,7 +22815,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          With a <literal>LIKE</literal> clause, the statement displays
+          With a <function role="sqlop">LIKE</function> clause, the statement
displays
           only rows for those variables with names that match the
           pattern:
         </para>

@@ -22907,7 +22907,7 @@
           TABLES</literal>, but provides a lot of information about each
           table. You can also get this list using the <command>mysqlshow
           --status <replaceable>db_name</replaceable></command>
command.
-          The <literal>LIKE</literal> clause, if present, indicates
+          The <function role="sqlop">LIKE</function> clause, if present,
indicates
           which table names to match. The <literal>WHERE</literal>
           clause can be given to select rows using more general
           conditions, as discussed in <xref linkend="extended-show"/>.

@@ -23221,7 +23221,7 @@
           non-<literal>TEMPORARY</literal> tables in a given database.
           You can also get this list using the <command>mysqlshow
           <replaceable>db_name</replaceable></command> command. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           table names to match. The <literal>WHERE</literal> clause can
           be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -23283,7 +23283,7 @@
           <literal>SHOW TRIGGERS</literal> lists the triggers currently
           defined on the MySQL server. This statement requires the
           <literal>TRIGGER</literal> privilege. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           trigger names to match. The <literal>WHERE</literal> clause
           can be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -23326,7 +23326,7 @@
 
         <note>
           <para>
-            When using a <literal>LIKE</literal> clause with
+            When using a <function role="sqlop">LIKE</function> clause with
             <literal>SHOW TRIGGERS</literal>, the expression to be
             matched (<replaceable>expr</replaceable>) is compared with
             the name of the table on which the trigger is declared, and

@@ -23486,7 +23486,7 @@
           <literal>SHOW VARIABLES</literal> shows the values of MySQL
           system variables. This information also can be obtained using
           the <command>mysqladmin variables</command> command. The
-          <literal>LIKE</literal> clause, if present, indicates which
+          <function role="sqlop">LIKE</function> clause, if present,
indicates which
           variable names to match. The <literal>WHERE</literal> clause
           can be given to select rows using more general conditions, as
           discussed in <xref linkend="extended-show"/>.

@@ -23586,10 +23586,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          With a <literal>LIKE</literal> clause, the statement displays
+          With a <function role="sqlop">LIKE</function> clause, the statement
displays
           only rows for those variables with names that match the
           pattern. To obtain the row for a specific variable, use a
-          <literal>LIKE</literal> clause as shown:
+          <function role="sqlop">LIKE</function> clause as shown:
         </para>
 
 <programlisting>

@@ -23600,7 +23600,7 @@
         <para>
           To get a list of variables whose name match a pattern, use the
           <quote><literal>%</literal></quote> wildcard character
in a
-          <literal>LIKE</literal> clause:
+          <function role="sqlop">LIKE</function> clause:
         </para>
 
 <programlisting>


Modified: trunk/refman-6.0/tutorial.xml
===================================================================
--- trunk/refman-6.0/tutorial.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-6.0/tutorial.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 1598 bytes

@@ -2065,8 +2065,8 @@
           MySQL, SQL patterns are case-insensitive by default. Some
           examples are shown here. Note that you do not use
           <literal>=</literal> or
<literal>&lt;&gt;</literal> when you
-          use SQL patterns; use the <literal>LIKE</literal> or
-          <literal>NOT LIKE</literal> comparison operators instead.
+          use SQL patterns; use the <function role="sqlop">LIKE</function> or
+          <function role="sqlop">NOT LIKE</function> comparison operators
instead.
         </para>
 
         <para>

@@ -2186,7 +2186,7 @@
             <para>
               A <function role="sqlop">REGEXP</function> pattern match
               succeeds if the pattern matches anywhere in the value
-              being tested. (This differs from a <literal>LIKE</literal>
+              being tested. (This differs from a <function
role="sqlop">LIKE</function>
               pattern match, which succeeds only if the pattern matches
               the entire value.)
             </para>

@@ -2206,7 +2206,7 @@
 
         <para>
           To demonstrate how extended regular expressions work, the
-          <literal>LIKE</literal> queries shown previously are rewritten
+          <function role="sqlop">LIKE</function> queries shown previously are
rewritten
           here to use <function role="sqlop">REGEXP</function>.
         </para>
 


Modified: trunk/refman-common/news-innodb.xml
===================================================================
--- trunk/refman-common/news-innodb.xml	2008-01-09 17:14:19 UTC (rev 9534)
+++ trunk/refman-common/news-innodb.xml	2008-01-09 19:14:38 UTC (rev 9535)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 677 bytes

@@ -500,7 +500,8 @@
 
       <listitem>
         <para>
-          Fixed a bug: in <literal>LIKE 'abc%'</literal>, the
+          Fixed a bug: in <function role="sqlop" condition="like">LIKE
+'abc%'</function>, the
           <literal>'%'</literal> did not match the empty string if the
           character set was not <literal>latin1_swedish_ci</literal>.
           This bug was fixed by changing the sorting order in these


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