List:Commits« Previous MessageNext Message »
From:paul Date:December 13 2007 9:05pm
Subject:svn commit - mysqldoc@docsrva: r9299 - in trunk: . dynamic-docs/opsfunctions it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0
View as plain text  
Author: paul
Date: 2007-12-13 22:05:51 +0100 (Thu, 13 Dec 2007)
New Revision: 9299

Log:
 r34264@arctic:  paul | 2007-12-13 15:03:40 -0600
 Add markup.


Modified:
   trunk/dynamic-docs/opsfunctions/opfunctions.xml
   trunk/it/refman-5.1/data-types.xml
   trunk/it/refman-5.1/dba-core.xml
   trunk/it/refman-5.1/functions-core.xml
   trunk/it/refman-5.1/partitioning.xml
   trunk/it/refman-5.1/replication-topology.xml
   trunk/pt/refman-5.1/data-types.xml
   trunk/pt/refman-5.1/dba-core.xml
   trunk/pt/refman-5.1/functions-core.xml
   trunk/pt/refman-5.1/partitioning.xml
   trunk/pt/refman-5.1/replication-topology.xml
   trunk/refman-4.1/data-types.xml
   trunk/refman-4.1/functions-core.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.0/dba-core.xml
   trunk/refman-5.0/functions-core.xml
   trunk/refman-5.1/data-types.xml
   trunk/refman-5.1/dba-core.xml
   trunk/refman-5.1/functions-core.xml
   trunk/refman-5.1/partitioning.xml
   trunk/refman-6.0/data-types.xml
   trunk/refman-6.0/dba-core.xml
   trunk/refman-6.0/functions-core.xml
   trunk/refman-6.0/partitioning.xml

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


Modified: trunk/dynamic-docs/opsfunctions/opfunctions.xml
===================================================================
--- trunk/dynamic-docs/opsfunctions/opfunctions.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/dynamic-docs/opsfunctions/opfunctions.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 589 bytes

@@ -4203,7 +4203,7 @@
     </versions>
   </opfunction>
   
-  <opfunction type="operator" id="by" class="numeric-arithmetic" >
+  <opfunction type="operator" id="divide" class="numeric-arithmetic" >
     <display>/</display>
     <description lang="en">Division operator</description>
     <versions>


Modified: trunk/it/refman-5.1/data-types.xml
===================================================================
--- trunk/it/refman-5.1/data-types.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/it/refman-5.1/data-types.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 2, Lines Added: 15, Lines Deleted: 10; 2149 bytes

@@ -571,9 +571,11 @@
 
                 <listitem>
                   <para>
-                    When using operators (<literal>+</literal>,
-                    <literal>-</literal>, <literal>*</literal>, and so
-                    on) where both operands are integers.
+                    When using operators
+                    (<function role="sqlop" condition="operator_plus">+</function>,
+                    <function role="sqlop" condition="operator_minus">-</function>,
+                    <function role="sqlop" condition="operator_times">*</function>,
+                    and so on) where both operands are integers.
                   </para>
                 </listitem>
 

@@ -592,13 +594,16 @@
 
             <listitem>
               <para>
-                The <literal>-</literal>, <literal>+</literal>, and
-                <literal>*</literal> operators use
-                <literal>BIGINT</literal> arithmetic when both operands
-                are integer values. This means that if you multiply two
-                big integers (or results from functions that return
-                integers), you may get unexpected results when the
-                result is larger than
+                The
+                <function role="sqlop" condition="operator_minus">-</function>,
+                <function role="sqlop" condition="operator_plus">+</function>,
+                and
+                <function role="sqlop" condition="operator_times">*</function>
+                operators use <literal>BIGINT</literal> arithmetic when
+                both operands are integer values. This means that if you
+                multiply two big integers (or results from functions
+                that return integers), you may get unexpected results
+                when the result is larger than
                 <literal>9223372036854775807</literal>.
               </para>
             </listitem>


Modified: trunk/it/refman-5.1/dba-core.xml
===================================================================
--- trunk/it/refman-5.1/dba-core.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/it/refman-5.1/dba-core.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 3, Lines Added: 22, Lines Deleted: 5; 2185 bytes

@@ -4412,10 +4412,11 @@
           <para>
             This variable indicates the number of digits by which to
             increase the scale of the result of division operations
-            performed with the <literal>/</literal> operator. The
-            default value is 4. The minimum and maximum values are 0 and
-            30, respectively. The following example illustrates the
-            effect of increasing the default value.
+            performed with the
+            <function role="sqlop" condition="operator_divide">/</function>
+            operator. The default value is 4. The minimum and maximum
+            values are 0 and 30, respectively. The following example
+            illustrates the effect of increasing the default value.
           </para>
 
 <programlisting>

@@ -6337,6 +6338,22 @@
             numbers will be used in a batch of inserts. Default value:
             <literal>32</literal>. Minimum value: <literal>1</literal>.
           </para>
+          
+          &mccge-warning-begin;
+          
+          <para>
+            Beginning with MySQL 5.1.22-ndb-6.2.10 and MySQL
+            5.1.22-ndb-6.3.7, this variable affects the number of
+            <literal>AUTO_INCREMENT</literal> IDs that are fetched
+            between statements only. Within a statement, at least 32 IDs
+            are now obtained at a time. The default value for
+            <literal>ndb_autoincrement_prefetch_sz</literal> is now
+            <literal>1</literal>, to increase the speed of statements
+            inserting single rows. (Bug #31956)
+          </para>
+          
+          &mccge-warning-end-all;
+          
         </listitem>
 
         <listitem>

@@ -21478,7 +21495,7 @@
           </listitem>
 
           <listitem>
-            <para>
+            <para id="option_mysqld_ssl-verify-server-cert">
               <indexterm>
                 <primary>ssl-verify-server-cert option</primary>
               </indexterm>


Modified: trunk/it/refman-5.1/functions-core.xml
===================================================================
--- trunk/it/refman-5.1/functions-core.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/it/refman-5.1/functions-core.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 14, Lines Added: 50, Lines Deleted: 38; 7921 bytes

@@ -5449,10 +5449,13 @@
 
         <listitem>
           <para>
-            In the case of <literal>-</literal>, <literal>+</literal>,
-            and <literal>*</literal>, the result is calculated with
-            <literal>BIGINT</literal> (64-bit) precision if both
-            arguments are integers.
+            In the case of
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_plus">+</function>,
+            and
+            <function role="sqlop" condition="operator_times">*</function>,
+            the result is calculated with <literal>BIGINT</literal>
+            (64-bit) precision if both arguments are integers.
           </para>
         </listitem>
 

@@ -5466,19 +5469,23 @@
 
         <listitem>
           <para>
-            If any of the operands of a <literal>+</literal>,
-            <literal>-</literal>, <literal>/</literal>,
-            <literal>*</literal>, <literal>%</literal> is a real or
-            string value, then the precision of the result is the
-            precision of the argument with the maximum precision.
+            If any of the operands of a
+            <function role="sqlop" condition="operator_plus">+</function>,
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_divide">/</function>,
+            <function role="sqlop" condition="operator_times">*</function>,
+            <function role="sqlop" condition="operator_mod">%</function>
+            is a real or string value, then the precision of the result
+            is the precision of the argument with the maximum precision.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            In division performed with <literal>/</literal>, the scale
-            of the result when using two exact values is the scale of
-            the first argument plus the value of the
+            In division performed with
+            <function role="sqlop" condition="operator_divide">/</function>,
+            the scale of the result when using two exact values is the
+            scale of the first argument plus the value of the
             <literal>div_precision_increment</literal> system variable
             (which is 4 by default). For example, the result of the
             expression <literal>5.05 / 0.014</literal> has a scale of

@@ -5529,7 +5536,7 @@
               <primary>addition (+)</primary>
             </indexterm>
 
-            <literal>+</literal>
+            <function role="sqlop" condition="operator_plus">+</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5564,7 +5571,7 @@
               <primary>subtraction (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5604,7 +5611,7 @@
               <primary>unary minus (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_unary-minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5649,7 +5656,7 @@
               <primary>multiplication (*)</primary>
             </indexterm>
 
-            <literal>*</literal>
+            <function role="sqlop" condition="operator_times">*</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5686,7 +5693,7 @@
 
           <remark role="help-syntax-begin"/>
 
-          <para id="operator_by">
+          <para id="operator_divide">
             <indexterm>
               <primary>/ (division)</primary>
             </indexterm>

@@ -5695,7 +5702,7 @@
               <primary>division (/)</primary>
             </indexterm>
 
-            <literal>/</literal>
+            <function role="sqlop" condition="operator_divide">/</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -7938,7 +7945,10 @@
         <para>
           Date arithmetic also can be performed using
           <literal>INTERVAL</literal> together with the
-          <literal>+</literal> or <literal>-</literal> operator:
+          <function role="sqlop" condition="operator_plus">+</function>
+          or
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator:
         </para>
 
 <programlisting>

@@ -7949,10 +7959,12 @@
         <para>
           <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed on either
-          side of the <literal>+</literal> operator if the expression on
-          the other side is a date or datetime value. For the
-          <literal>-</literal> operator, <literal>INTERVAL
-          <replaceable>expr</replaceable>
+          side of the
+          <function role="sqlop" condition="operator_plus">+</function>
+          operator if the expression on the other side is a date or
+          datetime value. For the
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator, <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed only on
           the right side, because it makes no sense to subtract a date
           or datetime value from an interval.

@@ -13049,11 +13061,13 @@
     <para>
       MySQL supports arithmetic with both signed and unsigned 64-bit
       values. If you are using numeric operators (such as
-      <literal>+</literal> or <literal>-</literal>) and one of the
-      operands is an unsigned integer, the result is unsigned. You can
-      override this by using the <literal>SIGNED</literal> and
-      <literal>UNSIGNED</literal> cast operators to cast the operation
-      to a signed or unsigned 64-bit integer, respectively.
+      <function role="sqlop" condition="operator_plus">+</function> or
+      <function role="sqlop" condition="operator_minus">-</function>)
+      and one of the operands is an unsigned integer, the result is
+      unsigned. You can override this by using the
+      <literal>SIGNED</literal> and <literal>UNSIGNED</literal> cast
+      operators to cast the operation to a signed or unsigned 64-bit
+      integer, respectively.
     </para>
 
 <programlisting>

@@ -14802,9 +14816,8 @@
           </para>
 
           <para>
-            Note that this function works only if MySQL has been
-            configured with SSL support. See
-            <xref linkend="secure-connections"/>.
+            This function works only if MySQL has been configured with
+            SSL support. See <xref linkend="secure-connections"/>.
           </para>
 
           <para>

@@ -14856,14 +14869,13 @@
             algorithm.
           </para>
 
-          <remark role="help-description-end"/>
-
           <para>
-            Note that this function works only if MySQL has been
-            configured with SSL support. See
-            <xref linkend="secure-connections"/>.
+            This function works only if MySQL has been configured with
+            SSL support. See <xref linkend="secure-connections"/>.
           </para>
 
+          <remark role="help-description-end"/>
+
           <para>
             The encryption key to use is chosen based on the second
             argument to <function role="sql">DES_ENCRYPT()</function>,

@@ -15176,10 +15188,10 @@
         </listitem>
 
         <listitem>
-          <remark role="help-topic" condition="SHA"/>
+          <remark role="help-topic" condition="SHA1"/>
 
           <remark role="help-keywords">
-            SHA1
+            SHA1 SHA
           </remark>
 
           <remark role="help-syntax-begin"/>


Modified: trunk/it/refman-5.1/partitioning.xml
===================================================================
--- trunk/it/refman-5.1/partitioning.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/it/refman-5.1/partitioning.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 6, Lines Added: 36, Lines Deleted: 84; 7547 bytes

@@ -214,14 +214,15 @@
       <replaceable>intval</replaceable> such that
 
 <programlisting>
--MAXVALUE &lt; <replaceable>intval</replaceable> &lt; MAXVALUE
+-MAXVALUE &lt;= <replaceable>intval</replaceable> &lt;= MAXVALUE
 </programlisting>
 
-      (<literal>MAXVALUE</literal> is used to represent the greatest
-      possible positive integer.) There are some additional restrictions
-      on partitioning functions; see
-      <xref linkend="partitioning-limitations"/>, for more information
-      about these.
+      (<literal>MAXVALUE</literal> is used to represent the least upper
+      bound for the type of integer in question.
+      <literal>-MAXVALUE</literal> represents the greatest lower bound.)
+      There are some additional restrictions on partitioning functions;
+      see <xref linkend="partitioning-limitations"/>, for more
+      information about these.
     </para>
 
     <para>

@@ -856,14 +857,16 @@
       </note>
 
       <para>
-        <literal>MAXVALUE</literal> represents the greatest possible
-        integer value. Now, any rows whose <literal>store_id</literal>
-        column value is greater than or equal to 16 (the highest value
-        defined) are stored in partition <literal>p3</literal>. At some
-        point in the future &mdash; when the number of stores has
-        increased to 25, 30, or more &mdash; you can use an
-        <literal>ALTER TABLE</literal> statement to add new partitions
-        for stores 21-25, 26-30, and so on (see
+        <literal>MAXVALUE</literal> represents an integer value that is
+        always greater than the largest possible integer value (in
+        mathematical language, it serves as a <firstterm>least upper
+        bound</firstterm>). Now, any rows whose
+        <literal>store_id</literal> column value is greater than or
+        equal to 16 (the highest value defined) are stored in partition
+        <literal>p3</literal>. At some point in the future &mdash; when
+        the number of stores has increased to 25, 30, or more &mdash;
+        you can use an <literal>ALTER TABLE</literal> statement to add
+        new partitions for stores 21-25, 26-30, and so on (see
         <xref linkend="partitioning-management"/>, for details of how to
         do this).
       </para>

@@ -3757,64 +3760,6 @@
         <xref linkend="partitions-table"/>.
       </para>
 
-      <remark role="note">
-        [js] The following is commented out until it is determined
-        whether these two statements will actually be implemented.
-      </remark>
-
-<!--
-      <para>
-        Two additional <literal>SHOW</literal> commands are planned for
-        use with partitioned tables:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            <literal>SHOW PARTITIONS</literal>
-          </para>
-
-          <para>
-            This command is expected to work similarly to <literal>SHOW
-            TABLES</literal> and <literal>SHOW DATABASES</literal>,
-            except that it will list partitions rather than tables or
-            databases. The output from this command will likely consist
-            of a single column named
-            <literal>Partitions_in_<replaceable>tbl_name</replaceable></literal>,
-            where <replaceable>tbl_name</replaceable> is the name of the
-            partitioned table. It is not possible to
-            <quote>select</quote> a table in the sense that one selects
-            a database and it thereafter serves as the default database
-            for <literal>SHOW TABLES</literal>, so it is likely that
-            <literal>SHOW PARTITIONS</literal> will require the use of a
-            <literal>FROM</literal> clause so that MySQL knows which
-            table is intended.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>SHOW PARTITION STATUS</literal>
-          </para>
-
-          <para>
-            This command will provide detailed status information about
-            one or more partitions. Its output will likely contain the
-            same columns as or columns similar to those found in the
-            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
-            that will make it possible to obtain information about a
-            given partition by name, or about partitions belonging to
-            specific table or database.
-          </para>
-        </listitem>
-
-      </itemizedlist>
--->
-
       <indexterm>
         <primary>partitioning</primary>
         <secondary>optimization</secondary>

@@ -3982,7 +3927,7 @@
 
     <para>
       This section discusses <firstterm>partition pruning</firstterm>,
-      an opimisation which was implemented for partitioned tables in
+      an optimization which was implemented for partitioned tables in
       MySQL 5.1.6. The core concept behind partition pruning is
       relatively simple, and can be described as <quote>Do not scan
       partitions where there can be no matching values</quote>. For

@@ -4399,21 +4344,28 @@
               <secondary>operators disallowed in partitioning expressions</secondary>
             </indexterm>
 
-            Use of the arithmetic operators <literal>&plus;</literal>,
-            <literal>&minus;</literal>, <literal>&times;</literal>, and
-            <literal>/</literal> is permitted in partitioning
-            expressions. However, the result must be an integer value or
-            <literal>NULL</literal> (except in the case of
-            <literal>[LINEAR] KEY</literal> partitioning, as discussed
-            elswhere in this chapter &mdash; see
-            <xref linkend="partitioning-types"/>, for more information).
-            The <literal>DIV</literal> operator is also supported. (Bug
-            #30188)
+            Use of the arithmetic operators
+            <function role="sqlop" condition="operator_plus">&plus;</function>,
+            <function role="sqlop" condition="operator_minus">&minus;</function>,
+            and
+            <function role="sqlop" condition="operator_times">*</function>
+            is permitted in partitioning expressions. However, the
+            result must be an integer value or <literal>NULL</literal>
+            (except in the case of <literal>[LINEAR] KEY</literal>
+            partitioning, as discussed elswhere in this chapter &mdash;
+            see <xref linkend="partitioning-types"/>, for more
+            information).
           </para>
 
         </formalpara>
 
         <para>
+          Beginning with MySQL 5.1.23, the <literal>DIV</literal>
+          operator is also supported, and the <literal>/</literal>
+          operator is disallowed. (Bug #30188, Bug #33182)
+        </para>
+
+        <para>
           Beginning with MySQL 5.1.12, the bit operators
           <function role="sqlop" condition="operator_bitwise-or">|</function>,
           <function role="sqlop" condition="operator_bitwise-and">&amp;</function>,

@@ -4484,7 +4436,7 @@
       <listitem>
         <formalpara>
 
-          <title>Foreign keys</title>
+          <title>Foreign keys not supported</title>
 
           <indexterm>
             <primary>partitioning</primary>


Modified: trunk/it/refman-5.1/replication-topology.xml
===================================================================
--- trunk/it/refman-5.1/replication-topology.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/it/refman-5.1/replication-topology.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 7, Lines Added: 9, Lines Deleted: 22; 3846 bytes

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
 ]>
 <section id="replication-topology">

@@ -37,9 +35,7 @@
       <title>Replication with a single slave</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/slave-single.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/slave-single.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with a single slave</phrase>

@@ -61,9 +57,7 @@
       <title>Replication with multiple slaves</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/slaves-multiple.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/slaves-multiple.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with a multiple slaves</phrase>

@@ -85,9 +79,7 @@
       <title>Replication with twin masters</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/twinmaster.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/twinmaster.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with twin masters</phrase>

@@ -173,7 +165,7 @@
         For additional information about
         <literal>auto_increment_increment</literal> and
         <literal>auto_increment_offset</literal>, see
-        <xref linkend="server-system-variables" />.
+        <xref linkend="server-system-variables"/>.
       </para>
 
     </section>

@@ -192,17 +184,14 @@
       It is safe to connect servers in a circular master/slave
       relationship if you use the <option>--log-slave-updates</option>
       option. That means that you can create a setup as shown in
-      <xref
-        linkend="figure_replication-multimaster-chain"/>.
+      <xref linkend="figure_replication-multimaster-chain"/>.
     </para>
 
     <figure id="figure_replication-multimaster-circular">
       <title>Replication with multiple masters in a circular topology</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/multimaster-circular.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/multimaster-circular.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with multiple masters in a

@@ -246,9 +235,7 @@
       <title>Replication with multiple masters in a chain topology</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/multimaster-chain.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/multimaster-chain.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with multiple masters in a chain


Modified: trunk/pt/refman-5.1/data-types.xml
===================================================================
--- trunk/pt/refman-5.1/data-types.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/pt/refman-5.1/data-types.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 2, Lines Added: 15, Lines Deleted: 10; 2149 bytes

@@ -571,9 +571,11 @@
 
                 <listitem>
                   <para>
-                    When using operators (<literal>+</literal>,
-                    <literal>-</literal>, <literal>*</literal>, and so
-                    on) where both operands are integers.
+                    When using operators
+                    (<function role="sqlop" condition="operator_plus">+</function>,
+                    <function role="sqlop" condition="operator_minus">-</function>,
+                    <function role="sqlop" condition="operator_times">*</function>,
+                    and so on) where both operands are integers.
                   </para>
                 </listitem>
 

@@ -592,13 +594,16 @@
 
             <listitem>
               <para>
-                The <literal>-</literal>, <literal>+</literal>, and
-                <literal>*</literal> operators use
-                <literal>BIGINT</literal> arithmetic when both operands
-                are integer values. This means that if you multiply two
-                big integers (or results from functions that return
-                integers), you may get unexpected results when the
-                result is larger than
+                The
+                <function role="sqlop" condition="operator_minus">-</function>,
+                <function role="sqlop" condition="operator_plus">+</function>,
+                and
+                <function role="sqlop" condition="operator_times">*</function>
+                operators use <literal>BIGINT</literal> arithmetic when
+                both operands are integer values. This means that if you
+                multiply two big integers (or results from functions
+                that return integers), you may get unexpected results
+                when the result is larger than
                 <literal>9223372036854775807</literal>.
               </para>
             </listitem>


Modified: trunk/pt/refman-5.1/dba-core.xml
===================================================================
--- trunk/pt/refman-5.1/dba-core.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/pt/refman-5.1/dba-core.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 3, Lines Added: 22, Lines Deleted: 5; 2185 bytes

@@ -4412,10 +4412,11 @@
           <para>
             This variable indicates the number of digits by which to
             increase the scale of the result of division operations
-            performed with the <literal>/</literal> operator. The
-            default value is 4. The minimum and maximum values are 0 and
-            30, respectively. The following example illustrates the
-            effect of increasing the default value.
+            performed with the
+            <function role="sqlop" condition="operator_divide">/</function>
+            operator. The default value is 4. The minimum and maximum
+            values are 0 and 30, respectively. The following example
+            illustrates the effect of increasing the default value.
           </para>
 
 <programlisting>

@@ -6337,6 +6338,22 @@
             numbers will be used in a batch of inserts. Default value:
             <literal>32</literal>. Minimum value: <literal>1</literal>.
           </para>
+          
+          &mccge-warning-begin;
+          
+          <para>
+            Beginning with MySQL 5.1.22-ndb-6.2.10 and MySQL
+            5.1.22-ndb-6.3.7, this variable affects the number of
+            <literal>AUTO_INCREMENT</literal> IDs that are fetched
+            between statements only. Within a statement, at least 32 IDs
+            are now obtained at a time. The default value for
+            <literal>ndb_autoincrement_prefetch_sz</literal> is now
+            <literal>1</literal>, to increase the speed of statements
+            inserting single rows. (Bug #31956)
+          </para>
+          
+          &mccge-warning-end-all;
+          
         </listitem>
 
         <listitem>

@@ -21478,7 +21495,7 @@
           </listitem>
 
           <listitem>
-            <para>
+            <para id="option_mysqld_ssl-verify-server-cert">
               <indexterm>
                 <primary>ssl-verify-server-cert option</primary>
               </indexterm>


Modified: trunk/pt/refman-5.1/functions-core.xml
===================================================================
--- trunk/pt/refman-5.1/functions-core.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/pt/refman-5.1/functions-core.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 14, Lines Added: 50, Lines Deleted: 38; 7921 bytes

@@ -5449,10 +5449,13 @@
 
         <listitem>
           <para>
-            In the case of <literal>-</literal>, <literal>+</literal>,
-            and <literal>*</literal>, the result is calculated with
-            <literal>BIGINT</literal> (64-bit) precision if both
-            arguments are integers.
+            In the case of
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_plus">+</function>,
+            and
+            <function role="sqlop" condition="operator_times">*</function>,
+            the result is calculated with <literal>BIGINT</literal>
+            (64-bit) precision if both arguments are integers.
           </para>
         </listitem>
 

@@ -5466,19 +5469,23 @@
 
         <listitem>
           <para>
-            If any of the operands of a <literal>+</literal>,
-            <literal>-</literal>, <literal>/</literal>,
-            <literal>*</literal>, <literal>%</literal> is a real or
-            string value, then the precision of the result is the
-            precision of the argument with the maximum precision.
+            If any of the operands of a
+            <function role="sqlop" condition="operator_plus">+</function>,
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_divide">/</function>,
+            <function role="sqlop" condition="operator_times">*</function>,
+            <function role="sqlop" condition="operator_mod">%</function>
+            is a real or string value, then the precision of the result
+            is the precision of the argument with the maximum precision.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            In division performed with <literal>/</literal>, the scale
-            of the result when using two exact values is the scale of
-            the first argument plus the value of the
+            In division performed with
+            <function role="sqlop" condition="operator_divide">/</function>,
+            the scale of the result when using two exact values is the
+            scale of the first argument plus the value of the
             <literal>div_precision_increment</literal> system variable
             (which is 4 by default). For example, the result of the
             expression <literal>5.05 / 0.014</literal> has a scale of

@@ -5529,7 +5536,7 @@
               <primary>addition (+)</primary>
             </indexterm>
 
-            <literal>+</literal>
+            <function role="sqlop" condition="operator_plus">+</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5564,7 +5571,7 @@
               <primary>subtraction (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5604,7 +5611,7 @@
               <primary>unary minus (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_unary-minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5649,7 +5656,7 @@
               <primary>multiplication (*)</primary>
             </indexterm>
 
-            <literal>*</literal>
+            <function role="sqlop" condition="operator_times">*</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5686,7 +5693,7 @@
 
           <remark role="help-syntax-begin"/>
 
-          <para id="operator_by">
+          <para id="operator_divide">
             <indexterm>
               <primary>/ (division)</primary>
             </indexterm>

@@ -5695,7 +5702,7 @@
               <primary>division (/)</primary>
             </indexterm>
 
-            <literal>/</literal>
+            <function role="sqlop" condition="operator_divide">/</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -7938,7 +7945,10 @@
         <para>
           Date arithmetic also can be performed using
           <literal>INTERVAL</literal> together with the
-          <literal>+</literal> or <literal>-</literal> operator:
+          <function role="sqlop" condition="operator_plus">+</function>
+          or
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator:
         </para>
 
 <programlisting>

@@ -7949,10 +7959,12 @@
         <para>
           <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed on either
-          side of the <literal>+</literal> operator if the expression on
-          the other side is a date or datetime value. For the
-          <literal>-</literal> operator, <literal>INTERVAL
-          <replaceable>expr</replaceable>
+          side of the
+          <function role="sqlop" condition="operator_plus">+</function>
+          operator if the expression on the other side is a date or
+          datetime value. For the
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator, <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed only on
           the right side, because it makes no sense to subtract a date
           or datetime value from an interval.

@@ -13049,11 +13061,13 @@
     <para>
       MySQL supports arithmetic with both signed and unsigned 64-bit
       values. If you are using numeric operators (such as
-      <literal>+</literal> or <literal>-</literal>) and one of the
-      operands is an unsigned integer, the result is unsigned. You can
-      override this by using the <literal>SIGNED</literal> and
-      <literal>UNSIGNED</literal> cast operators to cast the operation
-      to a signed or unsigned 64-bit integer, respectively.
+      <function role="sqlop" condition="operator_plus">+</function> or
+      <function role="sqlop" condition="operator_minus">-</function>)
+      and one of the operands is an unsigned integer, the result is
+      unsigned. You can override this by using the
+      <literal>SIGNED</literal> and <literal>UNSIGNED</literal> cast
+      operators to cast the operation to a signed or unsigned 64-bit
+      integer, respectively.
     </para>
 
 <programlisting>

@@ -14802,9 +14816,8 @@
           </para>
 
           <para>
-            Note that this function works only if MySQL has been
-            configured with SSL support. See
-            <xref linkend="secure-connections"/>.
+            This function works only if MySQL has been configured with
+            SSL support. See <xref linkend="secure-connections"/>.
           </para>
 
           <para>

@@ -14856,14 +14869,13 @@
             algorithm.
           </para>
 
-          <remark role="help-description-end"/>
-
           <para>
-            Note that this function works only if MySQL has been
-            configured with SSL support. See
-            <xref linkend="secure-connections"/>.
+            This function works only if MySQL has been configured with
+            SSL support. See <xref linkend="secure-connections"/>.
           </para>
 
+          <remark role="help-description-end"/>
+
           <para>
             The encryption key to use is chosen based on the second
             argument to <function role="sql">DES_ENCRYPT()</function>,

@@ -15176,10 +15188,10 @@
         </listitem>
 
         <listitem>
-          <remark role="help-topic" condition="SHA"/>
+          <remark role="help-topic" condition="SHA1"/>
 
           <remark role="help-keywords">
-            SHA1
+            SHA1 SHA
           </remark>
 
           <remark role="help-syntax-begin"/>


Modified: trunk/pt/refman-5.1/partitioning.xml
===================================================================
--- trunk/pt/refman-5.1/partitioning.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/pt/refman-5.1/partitioning.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 6, Lines Added: 36, Lines Deleted: 84; 7547 bytes

@@ -214,14 +214,15 @@
       <replaceable>intval</replaceable> such that
 
 <programlisting>
--MAXVALUE &lt; <replaceable>intval</replaceable> &lt; MAXVALUE
+-MAXVALUE &lt;= <replaceable>intval</replaceable> &lt;= MAXVALUE
 </programlisting>
 
-      (<literal>MAXVALUE</literal> is used to represent the greatest
-      possible positive integer.) There are some additional restrictions
-      on partitioning functions; see
-      <xref linkend="partitioning-limitations"/>, for more information
-      about these.
+      (<literal>MAXVALUE</literal> is used to represent the least upper
+      bound for the type of integer in question.
+      <literal>-MAXVALUE</literal> represents the greatest lower bound.)
+      There are some additional restrictions on partitioning functions;
+      see <xref linkend="partitioning-limitations"/>, for more
+      information about these.
     </para>
 
     <para>

@@ -856,14 +857,16 @@
       </note>
 
       <para>
-        <literal>MAXVALUE</literal> represents the greatest possible
-        integer value. Now, any rows whose <literal>store_id</literal>
-        column value is greater than or equal to 16 (the highest value
-        defined) are stored in partition <literal>p3</literal>. At some
-        point in the future &mdash; when the number of stores has
-        increased to 25, 30, or more &mdash; you can use an
-        <literal>ALTER TABLE</literal> statement to add new partitions
-        for stores 21-25, 26-30, and so on (see
+        <literal>MAXVALUE</literal> represents an integer value that is
+        always greater than the largest possible integer value (in
+        mathematical language, it serves as a <firstterm>least upper
+        bound</firstterm>). Now, any rows whose
+        <literal>store_id</literal> column value is greater than or
+        equal to 16 (the highest value defined) are stored in partition
+        <literal>p3</literal>. At some point in the future &mdash; when
+        the number of stores has increased to 25, 30, or more &mdash;
+        you can use an <literal>ALTER TABLE</literal> statement to add
+        new partitions for stores 21-25, 26-30, and so on (see
         <xref linkend="partitioning-management"/>, for details of how to
         do this).
       </para>

@@ -3757,64 +3760,6 @@
         <xref linkend="partitions-table"/>.
       </para>
 
-      <remark role="note">
-        [js] The following is commented out until it is determined
-        whether these two statements will actually be implemented.
-      </remark>
-
-<!--
-      <para>
-        Two additional <literal>SHOW</literal> commands are planned for
-        use with partitioned tables:
-      </para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>
-            <literal>SHOW PARTITIONS</literal>
-          </para>
-
-          <para>
-            This command is expected to work similarly to <literal>SHOW
-            TABLES</literal> and <literal>SHOW DATABASES</literal>,
-            except that it will list partitions rather than tables or
-            databases. The output from this command will likely consist
-            of a single column named
-            <literal>Partitions_in_<replaceable>tbl_name</replaceable></literal>,
-            where <replaceable>tbl_name</replaceable> is the name of the
-            partitioned table. It is not possible to
-            <quote>select</quote> a table in the sense that one selects
-            a database and it thereafter serves as the default database
-            for <literal>SHOW TABLES</literal>, so it is likely that
-            <literal>SHOW PARTITIONS</literal> will require the use of a
-            <literal>FROM</literal> clause so that MySQL knows which
-            table is intended.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>SHOW PARTITION STATUS</literal>
-          </para>
-
-          <para>
-            This command will provide detailed status information about
-            one or more partitions. Its output will likely contain the
-            same columns as or columns similar to those found in the
-            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
-            that will make it possible to obtain information about a
-            given partition by name, or about partitions belonging to
-            specific table or database.
-          </para>
-        </listitem>
-
-      </itemizedlist>
--->
-
       <indexterm>
         <primary>partitioning</primary>
         <secondary>optimization</secondary>

@@ -3982,7 +3927,7 @@
 
     <para>
       This section discusses <firstterm>partition pruning</firstterm>,
-      an opimisation which was implemented for partitioned tables in
+      an optimization which was implemented for partitioned tables in
       MySQL 5.1.6. The core concept behind partition pruning is
       relatively simple, and can be described as <quote>Do not scan
       partitions where there can be no matching values</quote>. For

@@ -4399,21 +4344,28 @@
               <secondary>operators disallowed in partitioning expressions</secondary>
             </indexterm>
 
-            Use of the arithmetic operators <literal>&plus;</literal>,
-            <literal>&minus;</literal>, <literal>&times;</literal>, and
-            <literal>/</literal> is permitted in partitioning
-            expressions. However, the result must be an integer value or
-            <literal>NULL</literal> (except in the case of
-            <literal>[LINEAR] KEY</literal> partitioning, as discussed
-            elswhere in this chapter &mdash; see
-            <xref linkend="partitioning-types"/>, for more information).
-            The <literal>DIV</literal> operator is also supported. (Bug
-            #30188)
+            Use of the arithmetic operators
+            <function role="sqlop" condition="operator_plus">&plus;</function>,
+            <function role="sqlop" condition="operator_minus">&minus;</function>,
+            and
+            <function role="sqlop" condition="operator_times">*</function>
+            is permitted in partitioning expressions. However, the
+            result must be an integer value or <literal>NULL</literal>
+            (except in the case of <literal>[LINEAR] KEY</literal>
+            partitioning, as discussed elswhere in this chapter &mdash;
+            see <xref linkend="partitioning-types"/>, for more
+            information).
           </para>
 
         </formalpara>
 
         <para>
+          Beginning with MySQL 5.1.23, the <literal>DIV</literal>
+          operator is also supported, and the <literal>/</literal>
+          operator is disallowed. (Bug #30188, Bug #33182)
+        </para>
+
+        <para>
           Beginning with MySQL 5.1.12, the bit operators
           <function role="sqlop" condition="operator_bitwise-or">|</function>,
           <function role="sqlop" condition="operator_bitwise-and">&amp;</function>,

@@ -4484,7 +4436,7 @@
       <listitem>
         <formalpara>
 
-          <title>Foreign keys</title>
+          <title>Foreign keys not supported</title>
 
           <indexterm>
             <primary>partitioning</primary>


Modified: trunk/pt/refman-5.1/replication-topology.xml
===================================================================
--- trunk/pt/refman-5.1/replication-topology.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/pt/refman-5.1/replication-topology.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 7, Lines Added: 9, Lines Deleted: 22; 3846 bytes

@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
-"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
-[
-  <!ENTITY % all.entities SYSTEM "all-entities.ent">
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN" "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<!ENTITY % all.entities SYSTEM "all-entities.ent">
   %all.entities;
 ]>
 <section id="replication-topology">

@@ -37,9 +35,7 @@
       <title>Replication with a single slave</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/slave-single.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/slave-single.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with a single slave</phrase>

@@ -61,9 +57,7 @@
       <title>Replication with multiple slaves</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/slaves-multiple.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/slaves-multiple.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with a multiple slaves</phrase>

@@ -85,9 +79,7 @@
       <title>Replication with twin masters</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/twinmaster.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/twinmaster.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with twin masters</phrase>

@@ -173,7 +165,7 @@
         For additional information about
         <literal>auto_increment_increment</literal> and
         <literal>auto_increment_offset</literal>, see
-        <xref linkend="server-system-variables" />.
+        <xref linkend="server-system-variables"/>.
       </para>
 
     </section>

@@ -192,17 +184,14 @@
       It is safe to connect servers in a circular master/slave
       relationship if you use the <option>--log-slave-updates</option>
       option. That means that you can create a setup as shown in
-      <xref
-        linkend="figure_replication-multimaster-chain"/>.
+      <xref linkend="figure_replication-multimaster-chain"/>.
     </para>
 
     <figure id="figure_replication-multimaster-circular">
       <title>Replication with multiple masters in a circular topology</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/multimaster-circular.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/multimaster-circular.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with multiple masters in a

@@ -246,9 +235,7 @@
       <title>Replication with multiple masters in a chain topology</title>
       <mediaobject>
         <imageobject>
-          <imagedata
-            fileref="../refman-common/images/published/multimaster-chain.png"
-            format="PNG" lang="en"/>
+          <imagedata fileref="../refman-common/images/published/multimaster-chain.png" format="PNG" lang="en"/>
         </imageobject>
         <textobject>
           <phrase lang="en">Replication with multiple masters in a chain


Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-4.1/data-types.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 2, Lines Added: 15, Lines Deleted: 10; 2140 bytes

@@ -574,9 +574,11 @@
 
                 <listitem>
                   <para>
-                    When using operators (<literal>+</literal>,
-                    <literal>-</literal>, <literal>*</literal>, and so
-                    on) where both operands are integers.
+                    When using operators
+                    (<function role="sqlop" condition="operator_plus">+</function>,
+                    <function role="sqlop" condition="operator_minus">-</function>,
+                    <function role="sqlop" condition="operator_times">*</function>,
+                    and so on) where both operands are integers.
                   </para>
                 </listitem>
 

@@ -595,13 +597,16 @@
 
             <listitem>
               <para>
-                The <literal>-</literal>, <literal>+</literal>, and
-                <literal>*</literal> operators use
-                <literal>BIGINT</literal> arithmetic when both operands
-                are integer values. This means that if you multiply two
-                big integers (or results from functions that return
-                integers), you may get unexpected results when the
-                result is larger than
+                The
+                <function role="sqlop" condition="operator_minus">-</function>,
+                <function role="sqlop" condition="operator_plus">+</function>,
+                and
+                <function role="sqlop" condition="operator_times">*</function>
+                operators use <literal>BIGINT</literal> arithmetic when
+                both operands are integer values. This means that if you
+                multiply two big integers (or results from functions
+                that return integers), you may get unexpected results
+                when the result is larger than
                 <literal>9223372036854775807</literal>.
               </para>
             </listitem>


Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-4.1/functions-core.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 11, Lines Added: 38, Lines Deleted: 25; 5875 bytes

@@ -5337,10 +5337,13 @@
 
         <listitem>
           <para>
-            In the case of <literal>-</literal>, <literal>+</literal>,
-            and <literal>*</literal>, the result is calculated with
-            <literal>BIGINT</literal> (64-bit) precision if both
-            arguments are integers.
+            In the case of
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_plus">+</function>,
+            and
+            <function role="sqlop" condition="operator_times">*</function>,
+            the result is calculated with <literal>BIGINT</literal>
+            (64-bit) precision if both arguments are integers.
           </para>
         </listitem>
 

@@ -5354,11 +5357,14 @@
 
         <listitem>
           <para>
-            If any of the operands of a <literal>+</literal>,
-            <literal>-</literal>, <literal>/</literal>,
-            <literal>*</literal>, <literal>%</literal> is a real or
-            string value, then the precision of the result is the
-            precision of the argument with the maximum precision.
+            If any of the operands of a
+            <function role="sqlop" condition="operator_plus">+</function>,
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_divide">/</function>,
+            <function role="sqlop" condition="operator_times">*</function>,
+            <function role="sqlop" condition="operator_mod">%</function>
+            is a real or string value, then the precision of the result
+            is the precision of the argument with the maximum precision.
           </para>
         </listitem>
 

@@ -5405,7 +5411,7 @@
               <primary>addition (+)</primary>
             </indexterm>
 
-            <literal>+</literal>
+            <function role="sqlop" condition="operator_plus">+</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5440,7 +5446,7 @@
               <primary>subtraction (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5480,7 +5486,7 @@
               <primary>unary minus (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_unary-minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5525,7 +5531,7 @@
               <primary>multiplication (*)</primary>
             </indexterm>
 
-            <literal>*</literal>
+            <function role="sqlop" condition="operator_times">*</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5562,7 +5568,7 @@
 
           <remark role="help-syntax-begin"/>
 
-          <para id="operator_by">
+          <para id="operator_divide">
             <indexterm>
               <primary>/ (division)</primary>
             </indexterm>

@@ -5571,7 +5577,7 @@
               <primary>division (/)</primary>
             </indexterm>
 
-            <literal>/</literal>
+            <function role="sqlop" condition="operator_divide">/</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -7802,7 +7808,10 @@
         <para>
           As of MySQL 3.23, date arithmetic also can be performed using
           <literal>INTERVAL</literal> together with the
-          <literal>+</literal> or <literal>-</literal> operator:
+          <function role="sqlop" condition="operator_plus">+</function>
+          or
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator:
         </para>
 
 <programlisting>

@@ -7813,10 +7822,12 @@
         <para>
           <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed on either
-          side of the <literal>+</literal> operator if the expression on
-          the other side is a date or datetime value. For the
-          <literal>-</literal> operator, <literal>INTERVAL
-          <replaceable>expr</replaceable>
+          side of the
+          <function role="sqlop" condition="operator_plus">+</function>
+          operator if the expression on the other side is a date or
+          datetime value. For the
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator, <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed only on
           the right side, because it makes no sense to subtract a date
           or datetime value from an interval.

@@ -12886,11 +12897,13 @@
     <para>
       MySQL supports arithmetic with both signed and unsigned 64-bit
       values. If you are using numeric operators (such as
-      <literal>+</literal> or <literal>-</literal>) and one of the
-      operands is an unsigned integer, the result is unsigned. You can
-      override this by using the <literal>SIGNED</literal> and
-      <literal>UNSIGNED</literal> cast operators to cast the operation
-      to a signed or unsigned 64-bit integer, respectively.
+      <function role="sqlop" condition="operator_plus">+</function> or
+      <function role="sqlop" condition="operator_minus">-</function>)
+      and one of the operands is an unsigned integer, the result is
+      unsigned. You can override this by using the
+      <literal>SIGNED</literal> and <literal>UNSIGNED</literal> cast
+      operators to cast the operation to a signed or unsigned 64-bit
+      integer, respectively.
     </para>
 
 <programlisting>


Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-5.0/data-types.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 2, Lines Added: 15, Lines Deleted: 10; 2140 bytes

@@ -579,9 +579,11 @@
 
                 <listitem>
                   <para>
-                    When using operators (<literal>+</literal>,
-                    <literal>-</literal>, <literal>*</literal>, and so
-                    on) where both operands are integers.
+                    When using operators
+                    (<function role="sqlop" condition="operator_plus">+</function>,
+                    <function role="sqlop" condition="operator_minus">-</function>,
+                    <function role="sqlop" condition="operator_times">*</function>,
+                    and so on) where both operands are integers.
                   </para>
                 </listitem>
 

@@ -600,13 +602,16 @@
 
             <listitem>
               <para>
-                The <literal>-</literal>, <literal>+</literal>, and
-                <literal>*</literal> operators use
-                <literal>BIGINT</literal> arithmetic when both operands
-                are integer values. This means that if you multiply two
-                big integers (or results from functions that return
-                integers), you may get unexpected results when the
-                result is larger than
+                The
+                <function role="sqlop" condition="operator_minus">-</function>,
+                <function role="sqlop" condition="operator_plus">+</function>,
+                and
+                <function role="sqlop" condition="operator_times">*</function>
+                operators use <literal>BIGINT</literal> arithmetic when
+                both operands are integer values. This means that if you
+                multiply two big integers (or results from functions
+                that return integers), you may get unexpected results
+                when the result is larger than
                 <literal>9223372036854775807</literal>.
               </para>
             </listitem>


Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-5.0/dba-core.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1028 bytes

@@ -4230,10 +4230,11 @@
           <para>
             This variable indicates the number of digits by which to
             increase the scale of the result of division operations
-            performed with the <literal>/</literal> operator. The
-            default value is 4. The minimum and maximum values are 0 and
-            30, respectively. The following example illustrates the
-            effect of increasing the default value.
+            performed with the
+            <function role="sqlop" condition="operator_divide">/</function>
+            operator. The default value is 4. The minimum and maximum
+            values are 0 and 30, respectively. The following example
+            illustrates the effect of increasing the default value.
           </para>
 
 <programlisting>


Modified: trunk/refman-5.0/functions-core.xml
===================================================================
--- trunk/refman-5.0/functions-core.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-5.0/functions-core.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 11, Lines Added: 42, Lines Deleted: 28; 6545 bytes

@@ -5517,10 +5517,13 @@
 
         <listitem>
           <para>
-            In the case of <literal>-</literal>, <literal>+</literal>,
-            and <literal>*</literal>, the result is calculated with
-            <literal>BIGINT</literal> (64-bit) precision if both
-            arguments are integers.
+            In the case of
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_plus">+</function>,
+            and
+            <function role="sqlop" condition="operator_times">*</function>,
+            the result is calculated with <literal>BIGINT</literal>
+            (64-bit) precision if both arguments are integers.
           </para>
         </listitem>
 

@@ -5534,19 +5537,23 @@
 
         <listitem>
           <para>
-            If any of the operands of a <literal>+</literal>,
-            <literal>-</literal>, <literal>/</literal>,
-            <literal>*</literal>, <literal>%</literal> is a real or
-            string value, then the precision of the result is the
-            precision of the argument with the maximum precision.
+            If any of the operands of a
+            <function role="sqlop" condition="operator_plus">+</function>,
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_divide">/</function>,
+            <function role="sqlop" condition="operator_times">*</function>,
+            <function role="sqlop" condition="operator_mod">%</function>
+            is a real or string value, then the precision of the result
+            is the precision of the argument with the maximum precision.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            In division performed with <literal>/</literal>, the scale
-            of the result when using two exact values is the scale of
-            the first argument plus the value of the
+            In division performed with
+            <function role="sqlop" condition="operator_divide">/</function>,
+            the scale of the result when using two exact values is the
+            scale of the first argument plus the value of the
             <literal>div_precision_increment</literal> system variable
             (which is 4 by default). For example, the result of the
             expression <literal>5.05 / 0.014</literal> has a scale of

@@ -5597,7 +5604,7 @@
               <primary>addition (+)</primary>
             </indexterm>
 
-            <literal>+</literal>
+            <function role="sqlop" condition="operator_plus">+</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5632,7 +5639,7 @@
               <primary>subtraction (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5672,7 +5679,7 @@
               <primary>unary minus (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_unary-minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5717,7 +5724,7 @@
               <primary>multiplication (*)</primary>
             </indexterm>
 
-            <literal>*</literal>
+            <function role="sqlop" condition="operator_times">*</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5754,7 +5761,7 @@
 
           <remark role="help-syntax-begin"/>
 
-          <para id="operator_by">
+          <para id="operator_divide">
             <indexterm>
               <primary>/ (division)</primary>
             </indexterm>

@@ -5763,7 +5770,7 @@
               <primary>division (/)</primary>
             </indexterm>
 
-            <literal>/</literal>
+            <function role="sqlop" condition="operator_divide">/</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -7977,7 +7984,10 @@
         <para>
           Date arithmetic also can be performed using
           <literal>INTERVAL</literal> together with the
-          <literal>+</literal> or <literal>-</literal> operator:
+          <function role="sqlop" condition="operator_plus">+</function>
+          or
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator:
         </para>
 
 <programlisting>

@@ -7988,10 +7998,12 @@
         <para>
           <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed on either
-          side of the <literal>+</literal> operator if the expression on
-          the other side is a date or datetime value. For the
-          <literal>-</literal> operator, <literal>INTERVAL
-          <replaceable>expr</replaceable>
+          side of the
+          <function role="sqlop" condition="operator_plus">+</function>
+          operator if the expression on the other side is a date or
+          datetime value. For the
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator, <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed only on
           the right side, because it makes no sense to subtract a date
           or datetime value from an interval.

@@ -13075,11 +13087,13 @@
     <para>
       MySQL supports arithmetic with both signed and unsigned 64-bit
       values. If you are using numeric operators (such as
-      <literal>+</literal> or <literal>-</literal>) and one of the
-      operands is an unsigned integer, the result is unsigned. You can
-      override this by using the <literal>SIGNED</literal> and
-      <literal>UNSIGNED</literal> cast operators to cast the operation
-      to a signed or unsigned 64-bit integer, respectively.
+      <function role="sqlop" condition="operator_plus">+</function> or
+      <function role="sqlop" condition="operator_minus">-</function>)
+      and one of the operands is an unsigned integer, the result is
+      unsigned. You can override this by using the
+      <literal>SIGNED</literal> and <literal>UNSIGNED</literal> cast
+      operators to cast the operation to a signed or unsigned 64-bit
+      integer, respectively.
     </para>
 
 <programlisting>


Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-5.1/data-types.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 2, Lines Added: 15, Lines Deleted: 10; 2140 bytes

@@ -571,9 +571,11 @@
 
                 <listitem>
                   <para>
-                    When using operators (<literal>+</literal>,
-                    <literal>-</literal>, <literal>*</literal>, and so
-                    on) where both operands are integers.
+                    When using operators
+                    (<function role="sqlop" condition="operator_plus">+</function>,
+                    <function role="sqlop" condition="operator_minus">-</function>,
+                    <function role="sqlop" condition="operator_times">*</function>,
+                    and so on) where both operands are integers.
                   </para>
                 </listitem>
 

@@ -592,13 +594,16 @@
 
             <listitem>
               <para>
-                The <literal>-</literal>, <literal>+</literal>, and
-                <literal>*</literal> operators use
-                <literal>BIGINT</literal> arithmetic when both operands
-                are integer values. This means that if you multiply two
-                big integers (or results from functions that return
-                integers), you may get unexpected results when the
-                result is larger than
+                The
+                <function role="sqlop" condition="operator_minus">-</function>,
+                <function role="sqlop" condition="operator_plus">+</function>,
+                and
+                <function role="sqlop" condition="operator_times">*</function>
+                operators use <literal>BIGINT</literal> arithmetic when
+                both operands are integer values. This means that if you
+                multiply two big integers (or results from functions
+                that return integers), you may get unexpected results
+                when the result is larger than
                 <literal>9223372036854775807</literal>.
               </para>
             </listitem>


Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-5.1/dba-core.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1028 bytes

@@ -4412,10 +4412,11 @@
           <para>
             This variable indicates the number of digits by which to
             increase the scale of the result of division operations
-            performed with the <literal>/</literal> operator. The
-            default value is 4. The minimum and maximum values are 0 and
-            30, respectively. The following example illustrates the
-            effect of increasing the default value.
+            performed with the
+            <function role="sqlop" condition="operator_divide">/</function>
+            operator. The default value is 4. The minimum and maximum
+            values are 0 and 30, respectively. The following example
+            illustrates the effect of increasing the default value.
           </para>
 
 <programlisting>


Modified: trunk/refman-5.1/functions-core.xml
===================================================================
--- trunk/refman-5.1/functions-core.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-5.1/functions-core.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 11, Lines Added: 42, Lines Deleted: 28; 6545 bytes

@@ -5449,10 +5449,13 @@
 
         <listitem>
           <para>
-            In the case of <literal>-</literal>, <literal>+</literal>,
-            and <literal>*</literal>, the result is calculated with
-            <literal>BIGINT</literal> (64-bit) precision if both
-            arguments are integers.
+            In the case of
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_plus">+</function>,
+            and
+            <function role="sqlop" condition="operator_times">*</function>,
+            the result is calculated with <literal>BIGINT</literal>
+            (64-bit) precision if both arguments are integers.
           </para>
         </listitem>
 

@@ -5466,19 +5469,23 @@
 
         <listitem>
           <para>
-            If any of the operands of a <literal>+</literal>,
-            <literal>-</literal>, <literal>/</literal>,
-            <literal>*</literal>, <literal>%</literal> is a real or
-            string value, then the precision of the result is the
-            precision of the argument with the maximum precision.
+            If any of the operands of a
+            <function role="sqlop" condition="operator_plus">+</function>,
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_divide">/</function>,
+            <function role="sqlop" condition="operator_times">*</function>,
+            <function role="sqlop" condition="operator_mod">%</function>
+            is a real or string value, then the precision of the result
+            is the precision of the argument with the maximum precision.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            In division performed with <literal>/</literal>, the scale
-            of the result when using two exact values is the scale of
-            the first argument plus the value of the
+            In division performed with
+            <function role="sqlop" condition="operator_divide">/</function>,
+            the scale of the result when using two exact values is the
+            scale of the first argument plus the value of the
             <literal>div_precision_increment</literal> system variable
             (which is 4 by default). For example, the result of the
             expression <literal>5.05 / 0.014</literal> has a scale of

@@ -5529,7 +5536,7 @@
               <primary>addition (+)</primary>
             </indexterm>
 
-            <literal>+</literal>
+            <function role="sqlop" condition="operator_plus">+</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5564,7 +5571,7 @@
               <primary>subtraction (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5604,7 +5611,7 @@
               <primary>unary minus (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_unary-minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5649,7 +5656,7 @@
               <primary>multiplication (*)</primary>
             </indexterm>
 
-            <literal>*</literal>
+            <function role="sqlop" condition="operator_times">*</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5686,7 +5693,7 @@
 
           <remark role="help-syntax-begin"/>
 
-          <para id="operator_by">
+          <para id="operator_divide">
             <indexterm>
               <primary>/ (division)</primary>
             </indexterm>

@@ -5695,7 +5702,7 @@
               <primary>division (/)</primary>
             </indexterm>
 
-            <literal>/</literal>
+            <function role="sqlop" condition="operator_divide">/</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -7938,7 +7945,10 @@
         <para>
           Date arithmetic also can be performed using
           <literal>INTERVAL</literal> together with the
-          <literal>+</literal> or <literal>-</literal> operator:
+          <function role="sqlop" condition="operator_plus">+</function>
+          or
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator:
         </para>
 
 <programlisting>

@@ -7949,10 +7959,12 @@
         <para>
           <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed on either
-          side of the <literal>+</literal> operator if the expression on
-          the other side is a date or datetime value. For the
-          <literal>-</literal> operator, <literal>INTERVAL
-          <replaceable>expr</replaceable>
+          side of the
+          <function role="sqlop" condition="operator_plus">+</function>
+          operator if the expression on the other side is a date or
+          datetime value. For the
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator, <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed only on
           the right side, because it makes no sense to subtract a date
           or datetime value from an interval.

@@ -13049,11 +13061,13 @@
     <para>
       MySQL supports arithmetic with both signed and unsigned 64-bit
       values. If you are using numeric operators (such as
-      <literal>+</literal> or <literal>-</literal>) and one of the
-      operands is an unsigned integer, the result is unsigned. You can
-      override this by using the <literal>SIGNED</literal> and
-      <literal>UNSIGNED</literal> cast operators to cast the operation
-      to a signed or unsigned 64-bit integer, respectively.
+      <function role="sqlop" condition="operator_plus">+</function> or
+      <function role="sqlop" condition="operator_minus">-</function>)
+      and one of the operands is an unsigned integer, the result is
+      unsigned. You can override this by using the
+      <literal>SIGNED</literal> and <literal>UNSIGNED</literal> cast
+      operators to cast the operation to a signed or unsigned 64-bit
+      integer, respectively.
     </para>
 
 <programlisting>


Modified: trunk/refman-5.1/partitioning.xml
===================================================================
--- trunk/refman-5.1/partitioning.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-5.1/partitioning.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 2; 1032 bytes

@@ -4344,8 +4344,11 @@
               <secondary>operators disallowed in partitioning expressions</secondary>
             </indexterm>
 
-            Use of the arithmetic operators <literal>&plus;</literal>,
-            <literal>&minus;</literal>, and <literal>&times;</literal>
+            Use of the arithmetic operators
+            <function role="sqlop" condition="operator_plus">&plus;</function>,
+            <function role="sqlop" condition="operator_minus">&minus;</function>,
+            and
+            <function role="sqlop" condition="operator_times">*</function>
             is permitted in partitioning expressions. However, the
             result must be an integer value or <literal>NULL</literal>
             (except in the case of <literal>[LINEAR] KEY</literal>


Modified: trunk/refman-6.0/data-types.xml
===================================================================
--- trunk/refman-6.0/data-types.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-6.0/data-types.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 2, Lines Added: 15, Lines Deleted: 10; 2140 bytes

@@ -571,9 +571,11 @@
 
                 <listitem>
                   <para>
-                    When using operators (<literal>+</literal>,
-                    <literal>-</literal>, <literal>*</literal>, and so
-                    on) where both operands are integers.
+                    When using operators
+                    (<function role="sqlop" condition="operator_plus">+</function>,
+                    <function role="sqlop" condition="operator_minus">-</function>,
+                    <function role="sqlop" condition="operator_times">*</function>,
+                    and so on) where both operands are integers.
                   </para>
                 </listitem>
 

@@ -592,13 +594,16 @@
 
             <listitem>
               <para>
-                The <literal>-</literal>, <literal>+</literal>, and
-                <literal>*</literal> operators use
-                <literal>BIGINT</literal> arithmetic when both operands
-                are integer values. This means that if you multiply two
-                big integers (or results from functions that return
-                integers), you may get unexpected results when the
-                result is larger than
+                The
+                <function role="sqlop" condition="operator_minus">-</function>,
+                <function role="sqlop" condition="operator_plus">+</function>,
+                and
+                <function role="sqlop" condition="operator_times">*</function>
+                operators use <literal>BIGINT</literal> arithmetic when
+                both operands are integer values. This means that if you
+                multiply two big integers (or results from functions
+                that return integers), you may get unexpected results
+                when the result is larger than
                 <literal>9223372036854775807</literal>.
               </para>
             </listitem>


Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-6.0/dba-core.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 4; 1028 bytes

@@ -4300,10 +4300,11 @@
           <para>
             This variable indicates the number of digits by which to
             increase the scale of the result of division operations
-            performed with the <literal>/</literal> operator. The
-            default value is 4. The minimum and maximum values are 0 and
-            30, respectively. The following example illustrates the
-            effect of increasing the default value.
+            performed with the
+            <function role="sqlop" condition="operator_divide">/</function>
+            operator. The default value is 4. The minimum and maximum
+            values are 0 and 30, respectively. The following example
+            illustrates the effect of increasing the default value.
           </para>
 
 <programlisting>


Modified: trunk/refman-6.0/functions-core.xml
===================================================================
--- trunk/refman-6.0/functions-core.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-6.0/functions-core.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 11, Lines Added: 42, Lines Deleted: 28; 6545 bytes

@@ -5785,10 +5785,13 @@
 
         <listitem>
           <para>
-            In the case of <literal>-</literal>, <literal>+</literal>,
-            and <literal>*</literal>, the result is calculated with
-            <literal>BIGINT</literal> (64-bit) precision if both
-            arguments are integers.
+            In the case of
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_plus">+</function>,
+            and
+            <function role="sqlop" condition="operator_times">*</function>,
+            the result is calculated with <literal>BIGINT</literal>
+            (64-bit) precision if both arguments are integers.
           </para>
         </listitem>
 

@@ -5802,19 +5805,23 @@
 
         <listitem>
           <para>
-            If any of the operands of a <literal>+</literal>,
-            <literal>-</literal>, <literal>/</literal>,
-            <literal>*</literal>, <literal>%</literal> is a real or
-            string value, then the precision of the result is the
-            precision of the argument with the maximum precision.
+            If any of the operands of a
+            <function role="sqlop" condition="operator_plus">+</function>,
+            <function role="sqlop" condition="operator_minus">-</function>,
+            <function role="sqlop" condition="operator_divide">/</function>,
+            <function role="sqlop" condition="operator_times">*</function>,
+            <function role="sqlop" condition="operator_mod">%</function>
+            is a real or string value, then the precision of the result
+            is the precision of the argument with the maximum precision.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            In division performed with <literal>/</literal>, the scale
-            of the result when using two exact values is the scale of
-            the first argument plus the value of the
+            In division performed with
+            <function role="sqlop" condition="operator_divide">/</function>,
+            the scale of the result when using two exact values is the
+            scale of the first argument plus the value of the
             <literal>div_precision_increment</literal> system variable
             (which is 4 by default). For example, the result of the
             expression <literal>5.05 / 0.014</literal> has a scale of

@@ -5865,7 +5872,7 @@
               <primary>addition (+)</primary>
             </indexterm>
 
-            <literal>+</literal>
+            <function role="sqlop" condition="operator_plus">+</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5900,7 +5907,7 @@
               <primary>subtraction (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5940,7 +5947,7 @@
               <primary>unary minus (-)</primary>
             </indexterm>
 
-            <literal>-</literal>
+            <function role="sqlop" condition="operator_unary-minus">-</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -5985,7 +5992,7 @@
               <primary>multiplication (*)</primary>
             </indexterm>
 
-            <literal>*</literal>
+            <function role="sqlop" condition="operator_times">*</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -6022,7 +6029,7 @@
 
           <remark role="help-syntax-begin"/>
 
-          <para id="operator_by">
+          <para id="operator_divide">
             <indexterm>
               <primary>/ (division)</primary>
             </indexterm>

@@ -6031,7 +6038,7 @@
               <primary>division (/)</primary>
             </indexterm>
 
-            <literal>/</literal>
+            <function role="sqlop" condition="operator_divide">/</function>
           </para>
 
           <remark role="help-syntax-end"/>

@@ -8263,7 +8270,10 @@
         <para>
           Date arithmetic also can be performed using
           <literal>INTERVAL</literal> together with the
-          <literal>+</literal> or <literal>-</literal> operator:
+          <function role="sqlop" condition="operator_plus">+</function>
+          or
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator:
         </para>
 
 <programlisting>

@@ -8274,10 +8284,12 @@
         <para>
           <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed on either
-          side of the <literal>+</literal> operator if the expression on
-          the other side is a date or datetime value. For the
-          <literal>-</literal> operator, <literal>INTERVAL
-          <replaceable>expr</replaceable>
+          side of the
+          <function role="sqlop" condition="operator_plus">+</function>
+          operator if the expression on the other side is a date or
+          datetime value. For the
+          <function role="sqlop" condition="operator_minus">-</function>
+          operator, <literal>INTERVAL <replaceable>expr</replaceable>
           <replaceable>unit</replaceable></literal> is allowed only on
           the right side, because it makes no sense to subtract a date
           or datetime value from an interval.

@@ -13374,11 +13386,13 @@
     <para>
       MySQL supports arithmetic with both signed and unsigned 64-bit
       values. If you are using numeric operators (such as
-      <literal>+</literal> or <literal>-</literal>) and one of the
-      operands is an unsigned integer, the result is unsigned. You can
-      override this by using the <literal>SIGNED</literal> and
-      <literal>UNSIGNED</literal> cast operators to cast the operation
-      to a signed or unsigned 64-bit integer, respectively.
+      <function role="sqlop" condition="operator_plus">+</function> or
+      <function role="sqlop" condition="operator_minus">-</function>)
+      and one of the operands is an unsigned integer, the result is
+      unsigned. You can override this by using the
+      <literal>SIGNED</literal> and <literal>UNSIGNED</literal> cast
+      operators to cast the operation to a signed or unsigned 64-bit
+      integer, respectively.
     </para>
 
 <programlisting>


Modified: trunk/refman-6.0/partitioning.xml
===================================================================
--- trunk/refman-6.0/partitioning.xml	2007-12-13 20:17:54 UTC (rev 9298)
+++ trunk/refman-6.0/partitioning.xml	2007-12-13 21:05:51 UTC (rev 9299)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 9; 2044 bytes

@@ -4244,21 +4244,26 @@
               <secondary>operators disallowed in partitioning expressions</secondary>
             </indexterm>
 
-            Use of the arithmetic operators <literal>&plus;</literal>,
-            <literal>&minus;</literal>, <literal>&times;</literal>, and
-            <literal>/</literal> is permitted in partitioning
-            expressions. However, the result must be an integer value or
-            <literal>NULL</literal> (except in the case of
-            <literal>[LINEAR] KEY</literal> partitioning, as discussed
-            elswhere in this chapter &mdash; see
-            <xref linkend="partitioning-types"/>, for more information).
+            Use of the arithmetic operators
+            <function role="sqlop" condition="operator_plus">&plus;</function>,
+            <function role="sqlop" condition="operator_minus">&minus;</function>,
+            <function role="sqlop" condition="operator_times">*</function>,
+            and
+            <function role="sqlop" condition="operator_divide">/</function>
+            is permitted in partitioning expressions. However, the
+            result must be an integer value or <literal>NULL</literal>
+            (except in the case of <literal>[LINEAR] KEY</literal>
+            partitioning, as discussed elswhere in this chapter &mdash;
+            see <xref linkend="partitioning-types"/>, for more
+            information).
           </para>
 
         </formalpara>
 
         <para>
           Beginning with MySQL 6.0.4, the <literal>DIV</literal>
-          operator is also supported, and the <literal>/</literal>
+          operator is also supported, and the
+          <function role="sqlop" condition="operator_divide">/</function>
           operator is disallowed. (Bug #30188, Bug #33182)
         </para>
 


Thread
svn commit - mysqldoc@docsrva: r9299 - in trunk: . dynamic-docs/opsfunctions it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0paul13 Dec