List:Internals« Previous MessageNext Message »
From:paul Date:September 3 2005 3:48am
Subject:bk commit - mysqldoc@docsrva tree (paul:1.3465)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3465 05/09/02 20:48:02 paul@stripped +4 -0
  Update descriptions for float/double/decimal
  with respect to M/D and precision/scale.
  Lots of tag-moving.

  refman/column-types.xml
    1.27 05/09/02 20:47:59 paul@stripped +176 -167
    Update descriptions for float/double/decimal
    with respect to M/D and precision/scale.
    Lots of tag-moving.

  refman-5.1/column-types.xml
    1.20 05/09/02 20:47:58 paul@stripped +436 -438
    Sync.

  refman-5.0/column-types.xml
    1.20 05/09/02 20:47:58 paul@stripped +435 -429
    Sync.

  refman-4.1/column-types.xml
    1.25 05/09/02 20:47:58 paul@stripped +426 -414
    Sync.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	paul
# Host:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc

--- 1.19/refman-5.1/column-types.xml	2005-09-02 18:22:59 -05:00
+++ 1.20/refman-5.1/column-types.xml	2005-09-02 20:47:58 -05:00
@@ -189,20 +189,20 @@
       <itemizedlist>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BIT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BIT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BIT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BIT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BIT</secondary>
+            </indexterm>
+
            
<literal>BIT[(<replaceable>M</replaceable>)]</literal>
           </para>
 
@@ -226,21 +226,21 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TINYINT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TINYINT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TINYINT BOOLEAN BOOL ZEROFILL
             UNSIGNED INT1
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TINYINT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TINYINT</secondary>
+            </indexterm>
+
             <literal>TINYINT[(<replaceable>M</replaceable>)] [UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -258,29 +258,29 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BOOLEAN data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>BOOL data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BOOLEAN</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BOOL</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BOOLEAN BOOL
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BOOLEAN data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>BOOL data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BOOLEAN</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BOOL</secondary>
+            </indexterm>
+
             <literal>BOOL</literal> , <literal>BOOLEAN</literal>
           </para>
 
@@ -301,20 +301,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>SMALLINT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>SMALLINT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic SMALLINT INT2
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>SMALLINT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>SMALLINT</secondary>
+            </indexterm>
+
             <literal>SMALLINT[(<replaceable>M</replaceable>)]
[UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -332,6 +332,10 @@
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic MEDIUMINT INT3 MIDDLEINT
+          </remark>
+
           <para>
             <indexterm type="type">
               <primary>MEDIUMINT data type</primary>
@@ -346,10 +350,6 @@
             [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
-          <remark>
-            description_for_help_topic MEDIUMINT INT3 MIDDLEINT
-          </remark>
-
           <para>
             A medium-size integer. The signed range is
             <literal>-8388608</literal> to
<literal>8388607</literal>.
@@ -363,21 +363,21 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>INT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>INT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic INT INT4 UNSIGNED ZEROFILL
             INTEGER
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>INT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>INT</secondary>
+            </indexterm>
+
             <literal>INT[(<replaceable>M</replaceable>)] [UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -415,20 +415,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BIGINT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BIGINT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BIGINT UNSIGNED ZEROFILL INT8
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BIGINT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BIGINT</secondary>
+            </indexterm>
+
             <literal>BIGINT[(<replaceable>M</replaceable>)] [UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -532,56 +532,49 @@
         </listitem>
 
         <listitem>
-          <indexterm type="concept">
-            <primary>floating-point number</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>FLOAT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>FLOAT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic FLOAT UNSIGNED ZEROFILL FLOAT4
           </remark>
 
           <para>
-            <literal>FLOAT(<replaceable>p</replaceable>) [UNSIGNED]
-            [ZEROFILL]</literal>
+            <indexterm type="type">
+              <primary>FLOAT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>FLOAT</secondary>
+            </indexterm>
+
+           
<literal>FLOAT[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
+            [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
           <para>
-            A floating-point number. <replaceable>p</replaceable>
-            represents the precision. It can be from 0 to 24 for a
-            single-precision floating-point number and from 25 to 53 for
-            a double-precision floating-point number. These types are
-            like the <literal>FLOAT</literal> and
-            <literal>DOUBLE</literal> types described immediately
-            following. <literal>FLOAT(p)</literal> has the same range as
-            the corresponding <literal>FLOAT</literal> and
-            <literal>DOUBLE</literal> types, but the display width and
-            number of decimals are undefined.
+            A small (single-precision) floating-point number. Allowable
+            values are <literal>-3.402823466E+38</literal> to
+            <literal>-1.175494351E-38</literal>,
<literal>0</literal>,
+            and <literal>1.175494351E-38</literal> to
+            <literal>3.402823466E+38</literal>. These are the
+            theoretical limits, based on the IEEE standard. The actual
+            range might be slightly smaller depending on your hardware
+            or operating system.
           </para>
 
           <para>
-            In MySQL 5.0, this is a true floating-point value.
+            <replaceable>M</replaceable> is the total number of decimal
+            digits and <replaceable>D</replaceable> is the number of
+            digits following the decimal point. If
+            <replaceable>M</replaceable> and
+            <replaceable>D</replaceable> are omitted, values are stored
+            to the limits allowed by the hardware. A single-precision
+            floating-point number is accurate to approximately 7 decimal
+            places.
           </para>
 
           <para>
-            <indexterm type="concept">
-              <primary>ODBC compatibility</primary>
-            </indexterm>
-
-            <indexterm type="concept">
-              <primary>compatibility</primary>
-              <secondary>with ODBC</secondary>
-            </indexterm>
-
-            This syntax is provided for ODBC compatibility.
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
           </para>
 
           <para>
@@ -590,45 +583,68 @@
             done with double precision. See
             <xref linkend="no-matching-rows"/>.
           </para>
+
+          <remark>
+            end_description_for_help_topic
+          </remark>
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic DOUBLE FLOAT8 UNSIGNED ZEROFILL
+            PRECISION REAL
+          </remark>
+
           <para>
             <indexterm type="type">
+              <primary>DOUBLE data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
               <primary>FLOAT data type</primary>
             </indexterm>
 
             <indexterm type="type">
               <primary>data type</primary>
+              <secondary>DOUBLE</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
               <secondary>FLOAT</secondary>
             </indexterm>
 
-           
<literal>FLOAT[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
+           
<literal>DOUBLE[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
             [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
           <para>
-            A small (single-precision) floating-point number. Allowable
-            values are <literal>-3.402823466E+38</literal> to
-            <literal>-1.175494351E-38</literal>,
<literal>0</literal>,
-            and <literal>1.175494351E-38</literal> to
-            <literal>3.402823466E+38</literal>. (These are the
+            A normal-size (double-precision) floating-point number.
+            Allowable values are
+            <literal>-1.7976931348623157E+308</literal> to
+            <literal>-2.2250738585072014E-308</literal>,
+            <literal>0</literal>, and
+            <literal>2.2250738585072014E-308</literal> to
+            <literal>1.7976931348623157E+308</literal>. These are the
             theoretical limits, based on the IEEE standard. The actual
             range might be slightly smaller depending on your hardware
-            or operating system.)
+            or operating system.
+          </para>
+
+          <para>
+            <replaceable>M</replaceable> is the total number of decimal
+            digits and <replaceable>D</replaceable> is the number of
+            digits following the decimal point. If
+            <replaceable>M</replaceable> and
+            <replaceable>D</replaceable> are omitted, values are stored
+            to the limits allowed by the hardware. A double-precision
+            floating-point number is accurate to approximately 15
+            decimal places.
           </para>
 
           <para>
             If <literal>UNSIGNED</literal> is specified, negative values
-            are disallowed. <replaceable>M</replaceable> is the display
-            width and <replaceable>D</replaceable> is the number of
-            significant digits. <literal>FLOAT</literal> without
-            arguments or
-           
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
-            (where <replaceable>p</replaceable> is in the range from 0
-            to 24) stands for a single-precision floating-point number.
-            A single-precision floating-point number is accurate to
-            approximately 7 decimal places.
+            are disallowed.
           </para>
 
           <remark>
@@ -637,59 +653,54 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DOUBLE data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>FLOAT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>DOUBLE</secondary>
-          </indexterm>
+          <para>
+            <indexterm type="concept">
+              <primary>floating-point number</primary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>FLOAT</secondary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>FLOAT data type</primary>
+            </indexterm>
 
-          <remark>
-            description_for_help_topic DOUBLE FLOAT8 UNSIGNED ZEROFILL
-            PRECISION REAL
-          </remark>
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>FLOAT</secondary>
+            </indexterm>
 
-          <para>
-           
<literal>DOUBLE[(<replaceable>M</replaceable>,<replaceable>B</replaceable>)]
-            [UNSIGNED] [ZEROFILL]</literal>
+            <literal>FLOAT(<replaceable>p</replaceable>) [UNSIGNED]
+            [ZEROFILL]</literal>
           </para>
 
           <para>
-            A normal-size (double-precision) floating-point number.
-            Allowable values are
-            <literal>-1.7976931348623157E+308</literal> to
-            <literal>-2.2250738585072014E-308</literal>,
-            <literal>0</literal>, and
-            <literal>2.2250738585072014E-308</literal> to
-            <literal>1.7976931348623157E+308</literal>. (These are the
-            theoretical limits, based on the IEEE standard. The actual
-            range might be slightly smaller depending on your hardware
-            or operating system.)
+            A floating-point number. <replaceable>p</replaceable>
+            represents the precision in bits, but MySQL uses this value
+            only to determine whether to give the resulting column a
+            data type of <literal>FLOAT</literal> or
+            <literal>DOUBLE</literal>. If
<replaceable>p</replaceable>
+            is from 0 to 24, the data type becomes
+            <literal>FLOAT</literal> with no
+            <replaceable>M</replaceable> or
<replaceable>D</replaceable>
+            values. If <replaceable>p</replaceable> is from 25 to 53,
+            the data type becomes <literal>DOUBLE</literal> with no
+            <replaceable>M</replaceable> or
<replaceable>D</replaceable>
+            values. The range of the resulting column is the same as for
+            the single-precision <literal>FLOAT</literal> or
+            double-precision <literal>DOUBLE</literal> data types
+            described earlier in this section.
           </para>
 
           <para>
-            If <literal>UNSIGNED</literal> is specified, negative values
-            are disallowed. <replaceable>M</replaceable> is the display
-            width and <replaceable>B</replaceable> is the number of bits
-            of precision. <literal>DOUBLE</literal> without arguments or
+            <indexterm type="concept">
+              <primary>ODBC compatibility</primary>
+            </indexterm>
+
+            <indexterm type="concept">
+              <primary>compatibility</primary>
+              <secondary>with ODBC</secondary>
+            </indexterm>
+
            
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
-            (where <replaceable>p</replaceable> is in the range from 25
-            to 53) stands for a double-precision floating-point number.
-            A single-precision floating-point number is accurate to
-            approximately 7 decimal places; a double-precision
-            floating-point number is accurate to approximately 15
-            decimal places.
+            syntax is provided for ODBC compatibility.
           </para>
         </listitem>
 
@@ -728,45 +739,38 @@
             <literal>FLOAT</literal> rather than
             <literal>DOUBLE</literal>.
           </para>
-
-          <remark>
-            end_description_for_help_topic
-          </remark>
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DECIMAL data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>DECIMAL</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic DECIMAL ZEROFILL UNSIGNED NUMERIC
             DEC FIXED
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>DECIMAL data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>DECIMAL</secondary>
+            </indexterm>
+
            
<literal>DECIMAL[(<replaceable>M</replaceable>[,<replaceable>D</replaceable>])]
             [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
-          <remark role="todo">
-            update for precision math
-          </remark>
-
           <para>
             For MySQL 5.0.3 and above:
           </para>
 
           <para>
-            A packed, exact fixed-point number.
-            <replaceable>M</replaceable> is the total number of digits
-            and <replaceable>D</replaceable> is the number of decimals.
-            The decimal point and (for negative numbers) the
+            A packed <quote>exact</quote> fixed-point number.
+            <replaceable>M</replaceable> is the total number of decimal
+            digits (the precision) and <replaceable>D</replaceable> is
+            the number of decimal digits after the decimal point (the
+            scale). The decimal point and (for negative numbers) the
             &lsquo;<literal>-</literal>&rsquo; sign are not counted
in
             <replaceable>M</replaceable>. If
             <replaceable>D</replaceable> is 0, values have no decimal
@@ -774,14 +778,14 @@
             (<replaceable>M</replaceable>) for
             <literal>DECIMAL</literal> is 64. The maximum number of
             supported decimals (<replaceable>D</replaceable>) is 30. If
-            <literal>UNSIGNED</literal> is specified, negative values
-            are disallowed.
+            <replaceable>D</replaceable> is omitted, the default is 0.
+            If <replaceable>M</replaceable> is omitted, the default is
+            10.
           </para>
 
           <para>
-            If <replaceable>D</replaceable> is omitted, the default is
-            0. If <replaceable>M</replaceable> is omitted, the default
-            is 10.
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
           </para>
 
           <para>
@@ -796,11 +800,12 @@
 
           <para>
             An unpacked fixed-point number. Behaves like a
-            <literal>CHAR</literal> column; "unpacked" means that the
-            number is stored as a string, using one character for each
-            digit of the value. <replaceable>M</replaceable> is the
-            total number of digits and <replaceable>D</replaceable> is
-            the number of decimals. The decimal point and (for negative
+            <literal>CHAR</literal> column;
<quote>unpacked</quote>
+            means the number is stored as a string, using one character
+            for each digit of the value. <replaceable>M</replaceable> is
+            the total number of decimal digits and
+            <replaceable>D</replaceable> is the number of decimal digits
+            after the decimal point. The decimal point and (for negative
             numbers) the &lsquo;<literal>-</literal>&rsquo; sign are
not
             counted in <replaceable>M</replaceable>, although space for
             them is reserved. If <replaceable>D</replaceable> is 0,
@@ -809,14 +814,15 @@
             for <literal>DOUBLE</literal>, but the actual range for a
             given <literal>DECIMAL</literal> column may be constrained
             by the choice of <replaceable>M</replaceable> and
-            <replaceable>D</replaceable>. If
<literal>UNSIGNED</literal>
-            is specified, negative values are disallowed.
+            <replaceable>D</replaceable>. If
+            <replaceable>D</replaceable> is omitted, the default is 0.
+            If <replaceable>M</replaceable> is omitted, the default is
+            10.
           </para>
 
           <para>
-            If <replaceable>D</replaceable> is omitted, the default is
-            0. If <replaceable>M</replaceable> is omitted, the default
-            is 10.
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
           </para>
         </listitem>
 
@@ -886,20 +892,20 @@
       <itemizedlist>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DATE data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>DATE</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic DATE DATE
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>DATE data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>DATE</secondary>
+            </indexterm>
+
             <literal>DATE</literal>
           </para>
 
@@ -919,20 +925,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DATETIME data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>DATETIME</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic DATETIME
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>DATETIME data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>DATETIME</secondary>
+            </indexterm>
+
             <literal>DATETIME</literal>
           </para>
 
@@ -952,20 +958,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TIMESTAMP data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TIMESTAMP</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TIMESTAMP TIMESTAMP
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TIMESTAMP data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TIMESTAMP</secondary>
+            </indexterm>
+
            
<literal>TIMESTAMP[(<replaceable>M</replaceable>)]</literal>
           </para>
 
@@ -1001,20 +1007,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TIME data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TIME</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TIME TIME
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TIME data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TIME</secondary>
+            </indexterm>
+
             <literal>TIME</literal>
           </para>
 
@@ -1033,20 +1039,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>YEAR data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>YEAR</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic YEAR type
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>YEAR data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>YEAR</secondary>
+            </indexterm>
+
             <literal>YEAR[(2|4)]</literal>
           </para>
 
@@ -1170,48 +1176,48 @@
       <itemizedlist>
 
         <listitem>
-          <indexterm type="type">
-            <primary>CHAR data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>NATIONAL CHAR data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>NCHAR data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>CHARACTER data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHAR</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>NATIONAL CHAR</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>NCHAR</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHARACTER</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic CHAR NATIONAL CHARACTER NCHAR
             BINARY
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>CHAR data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>NATIONAL CHAR data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>NCHAR data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>CHARACTER data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHAR</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>NATIONAL CHAR</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>NCHAR</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHARACTER</secondary>
+            </indexterm>
+
             <literal>[NATIONAL] CHAR(<replaceable>M</replaceable>)
             [BINARY | ASCII | UNICODE]</literal>
           </para>
@@ -1304,48 +1310,48 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>VARCHAR data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>CHARACTER VARYING data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>CHAR VARYING data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>VARCHARACTER data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>VARCHAR</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHARACTER VARYING</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHAR VARYING</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>VARCHARACTER</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic VARCHAR BINARY NATIONAL VARYING
             CHARACTER VARCHARACTER
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>VARCHAR data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>CHARACTER VARYING data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>CHAR VARYING data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>VARCHARACTER data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>VARCHAR</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHARACTER VARYING</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHAR VARYING</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>VARCHARACTER</secondary>
+            </indexterm>
+
             <literal>[NATIONAL] VARCHAR(<replaceable>M</replaceable>)
             [BINARY]</literal>
           </para>
@@ -1407,20 +1413,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BINARY data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BINARY</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BINARY
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BINARY data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BINARY</secondary>
+            </indexterm>
+
            
<literal>BINARY(<replaceable>M</replaceable>)</literal>
           </para>
 
@@ -1436,20 +1442,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>VARBINARY data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>VARBINARY</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic VARBINARY
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>VARBINARY data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>VARBINARY</secondary>
+            </indexterm>
+
            
<literal>VARBINARY(<replaceable>M</replaceable>)</literal>
           </para>
 
@@ -1465,20 +1471,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TINYBLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TINYBLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TINYBLOB
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TINYBLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TINYBLOB</secondary>
+            </indexterm>
+
             <literal>TINYBLOB</literal>
           </para>
 
@@ -1493,20 +1499,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TINYTEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TINYTEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TINYTEXT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TINYTEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TINYTEXT</secondary>
+            </indexterm>
+
             <literal>TINYTEXT</literal>
           </para>
 
@@ -1521,20 +1527,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BLOB type
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BLOB</secondary>
+            </indexterm>
+
            
<literal>BLOB[(<replaceable>M</replaceable>)]</literal>
           </para>
 
@@ -1557,20 +1563,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TEXT type
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TEXT</secondary>
+            </indexterm>
+
            
<literal>TEXT[(<replaceable>M</replaceable>)]</literal>
           </para>
 
@@ -1594,20 +1600,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>MEDIUMBLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>MEDIUMBLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic MEDIUMBLOB
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>MEDIUMBLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>MEDIUMBLOB</secondary>
+            </indexterm>
+
             <literal>MEDIUMBLOB</literal>
           </para>
 
@@ -1622,20 +1628,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>MEDIUMTEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>MEDIUMTEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic MEDIUMTEXT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>MEDIUMTEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>MEDIUMTEXT</secondary>
+            </indexterm>
+
             <literal>MEDIUMTEXT</literal>
           </para>
 
@@ -1651,20 +1657,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>LONGBLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>LONGBLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic LONGBLOB LONG LONGBINARY
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>LONGBLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>LONGBLOB</secondary>
+            </indexterm>
+
             <literal>LONGBLOB</literal>
           </para>
 
@@ -1683,20 +1689,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>LONGTEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>LONGTEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic LONGTEXT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>LONGTEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>LONGTEXT</secondary>
+            </indexterm>
+
             <literal>LONGTEXT</literal>
           </para>
 
@@ -1715,20 +1721,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>ENUM data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>ENUM</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic ENUM
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>ENUM data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>ENUM</secondary>
+            </indexterm>
+
            
<literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
           </para>
 
@@ -1750,20 +1756,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>SET data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>SET</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic type SET
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>SET data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>SET</secondary>
+            </indexterm>
+
            
<literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
           </para>
 
@@ -1823,14 +1829,6 @@
       the integer types.
     </para>
 
-    <remark>
-      FIX arjen 2002-08-07 New table, not yet measured for DocBook
-    </remark>
-
-    <remark>
-      FIX also need to shuffle into proper position and adjust text.
-    </remark>
-
     <informaltable>
       <tgroup cols="4">
         <colspec colwidth="15*"/>
@@ -1977,9 +1975,9 @@
       in bits following the keyword <literal>FLOAT</literal> in
       parentheses. The MySQL implementation also supports this optional
       precision specification, but the precision value is used only to
-      determine storage size. A precision from 0 to 23 results in
+      determine storage size. A precision from 0 to 23 results in a
       four-byte single-precision <literal>FLOAT</literal> column. A
-      precision from 24 to 53 results in eight-byte double-precision
+      precision from 24 to 53 results in an eight-byte double-precision
       <literal>DOUBLE</literal> column.
     </para>
 
@@ -2677,7 +2675,7 @@
 
         <listitem>
           <remark role="todo">
-            change next para when STRICT mode is implemented
+            Change next para when STRICT mode is implemented.
           </remark>
 
           <para>
@@ -3666,6 +3664,10 @@
         TEXT since 4.0.
       </remark>
 
+      <remark>
+        description_for_help_topic BLOB
+      </remark>
+
       <indexterm type="type">
         <primary>BLOB data type</primary>
       </indexterm>
@@ -3692,10 +3694,6 @@
         <primary>data type</primary>
         <secondary>LONG</secondary>
       </indexterm>
-
-      <remark>
-        description_for_help_topic BLOB
-      </remark>
 
       <para>
         A <literal>BLOB</literal> is a binary large object that can hold

--- 1.24/refman-4.1/column-types.xml	2005-09-02 18:22:59 -05:00
+++ 1.25/refman-4.1/column-types.xml	2005-09-02 20:47:58 -05:00
@@ -188,20 +188,20 @@
       <itemizedlist>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BIT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BIT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BIT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BIT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BIT</secondary>
+            </indexterm>
+
             <literal>BIT</literal>
           </para>
 
@@ -217,21 +217,21 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TINYINT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TINYINT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TINYINT BOOLEAN BOOL ZEROFILL
             UNSIGNED INT1
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TINYINT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TINYINT</secondary>
+            </indexterm>
+
             <literal>TINYINT[(<replaceable>M</replaceable>)] [UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -249,29 +249,29 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BOOLEAN data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>BOOL data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BOOLEAN</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BOOL</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BOOLEAN BOOL
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BOOLEAN data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>BOOL data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BOOLEAN</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BOOL</secondary>
+            </indexterm>
+
             <literal>BOOL</literal> , <literal>BOOLEAN</literal>
           </para>
 
@@ -288,20 +288,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>SMALLINT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>SMALLINT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic SMALLINT INT2
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>SMALLINT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>SMALLINT</secondary>
+            </indexterm>
+
             <literal>SMALLINT[(<replaceable>M</replaceable>)]
[UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -319,20 +319,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>MEDIUMINT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>MEDIUMINT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic MEDIUMINT INT3 MIDDLEINT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>MEDIUMINT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>MEDIUMINT</secondary>
+            </indexterm>
+
             <literal>MEDIUMINT[(<replaceable>M</replaceable>)]
             [UNSIGNED] [ZEROFILL]</literal>
           </para>
@@ -350,21 +350,21 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>INT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>INT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic INT INT4 UNSIGNED ZEROFILL
             INTEGER
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>INT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>INT</secondary>
+            </indexterm>
+
             <literal>INT[(<replaceable>M</replaceable>)] [UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -402,20 +402,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BIGINT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BIGINT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BIGINT UNSIGNED ZEROFILL INT8
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BIGINT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BIGINT</secondary>
+            </indexterm>
+
             <literal>BIGINT[(<replaceable>M</replaceable>)] [UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -519,59 +519,49 @@
         </listitem>
 
         <listitem>
-          <indexterm type="concept">
-            <primary>floating-point number</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>FLOAT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>FLOAT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic FLOAT UNSIGNED ZEROFILL FLOAT4
           </remark>
 
           <para>
-            <literal>FLOAT(<replaceable>p</replaceable>) [UNSIGNED]
-            [ZEROFILL]</literal>
+            <indexterm type="type">
+              <primary>FLOAT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>FLOAT</secondary>
+            </indexterm>
+
+           
<literal>FLOAT[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
+            [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
           <para>
-            A floating-point number. <replaceable>p</replaceable>
-            represents the precision. It can be from 0 to 24 for a
-            single-precision floating-point number and from 25 to 53 for
-            a double-precision floating-point number. These types are
-            like the <literal>FLOAT</literal> and
-            <literal>DOUBLE</literal> types described immediately
-            following. <literal>FLOAT(p)</literal> has the same range as
-            the corresponding <literal>FLOAT</literal> and
-            <literal>DOUBLE</literal> types, but the display width and
-            number of decimals are undefined.
+            A small (single-precision) floating-point number. Allowable
+            values are <literal>-3.402823466E+38</literal> to
+            <literal>-1.175494351E-38</literal>,
<literal>0</literal>,
+            and <literal>1.175494351E-38</literal> to
+            <literal>3.402823466E+38</literal>. These are the
+            theoretical limits, based on the IEEE standard. The actual
+            range might be slightly smaller depending on your hardware
+            or operating system.
           </para>
 
           <para>
-            As of MySQL 3.23, this is a true floating-point value. In
-            earlier MySQL versions,
-           
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
-            always has two decimals.
+            <replaceable>M</replaceable> is the total number of decimal
+            digits and <replaceable>D</replaceable> is the number of
+            digits following the decimal point. If
+            <replaceable>M</replaceable> and
+            <replaceable>D</replaceable> are omitted, values are stored
+            to the limits allowed by the hardware. A single-precision
+            floating-point number is accurate to approximately 7 decimal
+            places.
           </para>
 
           <para>
-            <indexterm type="concept">
-              <primary>ODBC compatibility</primary>
-            </indexterm>
-
-            <indexterm type="concept">
-              <primary>compatibility</primary>
-              <secondary>with ODBC</secondary>
-            </indexterm>
-
-            This syntax is provided for ODBC compatibility.
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
           </para>
 
           <para>
@@ -580,55 +570,74 @@
             done with double precision. See
             <xref linkend="no-matching-rows"/>.
           </para>
+
+          <remark>
+            end_description_for_help_topic
+          </remark>
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic DOUBLE FLOAT8 UNSIGNED ZEROFILL
+            PRECISION REAL
+          </remark>
+
           <para>
             <indexterm type="type">
+              <primary>DOUBLE data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
               <primary>FLOAT data type</primary>
             </indexterm>
 
             <indexterm type="type">
               <primary>data type</primary>
+              <secondary>DOUBLE</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
               <secondary>FLOAT</secondary>
             </indexterm>
 
-           
<literal>FLOAT[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
+           
<literal>DOUBLE[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
             [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
           <para>
-            A small (single-precision) floating-point number. Allowable
-            values are <literal>-3.402823466E+38</literal> to
-            <literal>-1.175494351E-38</literal>,
<literal>0</literal>,
-            and <literal>1.175494351E-38</literal> to
-            <literal>3.402823466E+38</literal>. (These are the
+            A normal-size (double-precision) floating-point number.
+            Allowable values are
+            <literal>-1.7976931348623157E+308</literal> to
+            <literal>-2.2250738585072014E-308</literal>,
+            <literal>0</literal>, and
+            <literal>2.2250738585072014E-308</literal> to
+            <literal>1.7976931348623157E+308</literal>. These are the
             theoretical limits, based on the IEEE standard. The actual
             range might be slightly smaller depending on your hardware
-            or operating system.)
+            or operating system.
           </para>
 
           <para>
-            If <literal>UNSIGNED</literal> is specified, negative values
-            are disallowed. <replaceable>M</replaceable> is the display
-            width and <replaceable>D</replaceable> is the number of
-            significant digits. <literal>FLOAT</literal> without
-            arguments or
-           
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
-            (where <replaceable>p</replaceable> is in the range from 0
-            to 24) stands for a single-precision floating-point number.
-            A single-precision floating-point number is accurate to
-            approximately 7 decimal places.
+            <replaceable>M</replaceable> is the total number of decimal
+            digits and <replaceable>D</replaceable> is the number of
+            digits following the decimal point. If
+            <replaceable>M</replaceable> and
+            <replaceable>D</replaceable> are omitted, values are stored
+            to the limits allowed by the hardware. A double-precision
+            floating-point number is accurate to approximately 15
+            decimal places.
           </para>
 
-          <remark>
-            end_description_for_help_topic
-          </remark>
+          <para>
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
+          </para>
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DOUBLE data type</primary>
+          <indexterm type="concept">
+            <primary>floating-point number</primary>
           </indexterm>
 
           <indexterm type="type">
@@ -637,49 +646,51 @@
 
           <indexterm type="type">
             <primary>data type</primary>
-            <secondary>DOUBLE</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
             <secondary>FLOAT</secondary>
           </indexterm>
 
-          <remark>
-            description_for_help_topic DOUBLE FLOAT8 UNSIGNED ZEROFILL
-            PRECISION REAL
-          </remark>
+          <para>
+            <literal>FLOAT(<replaceable>p</replaceable>) [UNSIGNED]
+            [ZEROFILL]</literal>
+          </para>
 
           <para>
-           
<literal>DOUBLE[(<replaceable>M</replaceable>,<replaceable>B</replaceable>)]
-            [UNSIGNED] [ZEROFILL]</literal>
+            A floating-point number. <replaceable>p</replaceable>
+            represents the precision in bits, but MySQL uses this value
+            only to determine whether to give the resulting column a
+            data type of <literal>FLOAT</literal> or
+            <literal>DOUBLE</literal>. If
<replaceable>p</replaceable>
+            is from 0 to 24, the data type becomes
+            <literal>FLOAT</literal> with no
+            <replaceable>M</replaceable> or
<replaceable>D</replaceable>
+            values. If <replaceable>p</replaceable> is from 25 to 53,
+            the data type becomes <literal>DOUBLE</literal> with no
+            <replaceable>M</replaceable> or
<replaceable>D</replaceable>
+            values. The range of the resulting column is the same as for
+            the single-precision <literal>FLOAT</literal> or
+            double-precision <literal>DOUBLE</literal> data types
+            described earlier in this section.
           </para>
 
           <para>
-            A normal-size (double-precision) floating-point number.
-            Allowable values are
-            <literal>-1.7976931348623157E+308</literal> to
-            <literal>-2.2250738585072014E-308</literal>,
-            <literal>0</literal>, and
-            <literal>2.2250738585072014E-308</literal> to
-            <literal>1.7976931348623157E+308</literal>. (These are the
-            theoretical limits, based on the IEEE standard. The actual
-            range might be slightly smaller depending on your hardware
-            or operating system.)
+            As of MySQL 3.23, this data type holds true floating-point
+            values. In earlier MySQL versions,
+           
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
+            always has two decimals.
           </para>
 
           <para>
-            If <literal>UNSIGNED</literal> is specified, negative values
-            are disallowed. <replaceable>M</replaceable> is the display
-            width and <replaceable>B</replaceable> is the number of bits
-            of precision. <literal>DOUBLE</literal> without arguments or
+            <indexterm type="concept">
+              <primary>ODBC compatibility</primary>
+            </indexterm>
+
+            <indexterm type="concept">
+              <primary>compatibility</primary>
+              <secondary>with ODBC</secondary>
+            </indexterm>
+
            
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
-            (where <replaceable>p</replaceable> is in the range from 25
-            to 53) stands for a double-precision floating-point number.
-            A single-precision floating-point number is accurate to
-            approximately 7 decimal places; a double-precision
-            floating-point number is accurate to approximately 15
-            decimal places.
+            syntax is provided for ODBC compatibility.
           </para>
         </listitem>
 
@@ -725,21 +736,21 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DECIMAL data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>DECIMAL</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic DECIMAL ZEROFILL UNSIGNED NUMERIC
             DEC FIXED
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>DECIMAL data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>DECIMAL</secondary>
+            </indexterm>
+
            
<literal>DECIMAL[(<replaceable>M</replaceable>[,<replaceable>D</replaceable>])]
             [UNSIGNED] [ZEROFILL]</literal>
           </para>
@@ -749,25 +760,26 @@
             <literal>CHAR</literal> column;
<quote>unpacked</quote>
             means the number is stored as a string, using one character
             for each digit of the value. <replaceable>M</replaceable> is
-            the total number of digits and <replaceable>D</replaceable>
-            is the number of decimals. The decimal point and (for
-            negative numbers) the &lsquo;<literal>-</literal>&rsquo;
-            sign are not counted in <replaceable>M</replaceable>,
-            although space for them is reserved. If
-            <replaceable>D</replaceable> is 0, values have no decimal
-            point or fractional part. The maximum range of
-            <literal>DECIMAL</literal> values is the same as for
-            <literal>DOUBLE</literal>, but the actual range for a given
-            <literal>DECIMAL</literal> column may be constrained by the
-            choice of <replaceable>M</replaceable> and
-            <replaceable>D</replaceable>. If
<literal>UNSIGNED</literal>
-            is specified, negative values are disallowed.
+            the total number of decimal digits and
+            <replaceable>D</replaceable> is the number of decimal digits
+            after the decimal point. The decimal point and (for negative
+            numbers) the &lsquo;<literal>-</literal>&rsquo; sign are
not
+            counted in <replaceable>M</replaceable>, although space for
+            them is reserved. If <replaceable>D</replaceable> is 0,
+            values have no decimal point or fractional part. The maximum
+            range of <literal>DECIMAL</literal> values is the same as
+            for <literal>DOUBLE</literal>, but the actual range for a
+            given <literal>DECIMAL</literal> column may be constrained
+            by the choice of <replaceable>M</replaceable> and
+            <replaceable>D</replaceable>. If
+            <replaceable>D</replaceable> is omitted, the default is 0.
+            If <replaceable>M</replaceable> is omitted, the default is
+            10.
           </para>
 
           <para>
-            If <replaceable>D</replaceable> is omitted, the default is
-            0. If <replaceable>M</replaceable> is omitted, the default
-            is 10.
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
           </para>
 
           <para>
@@ -844,20 +856,20 @@
       <itemizedlist>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DATE data type</primary>
-          </indexterm>
-
           <remark>
             description_for_help_topic DATE DATE
           </remark>
 
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>DATE</secondary>
-          </indexterm>
-
           <para>
+            <indexterm type="type">
+              <primary>DATE data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>DATE</secondary>
+            </indexterm>
+
             <literal>DATE</literal>
           </para>
 
@@ -877,20 +889,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DATETIME data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>DATETIME</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic DATETIME
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>DATETIME data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>DATETIME</secondary>
+            </indexterm>
+
             <literal>DATETIME</literal>
           </para>
 
@@ -910,20 +922,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TIMESTAMP data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TIMESTAMP</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TIMESTAMP TIMESTAMP
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TIMESTAMP data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TIMESTAMP</secondary>
+            </indexterm>
+
            
<literal>TIMESTAMP[(<replaceable>M</replaceable>)]</literal>
           </para>
 
@@ -998,20 +1010,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TIME data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TIME</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TIME TIME
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TIME data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TIME</secondary>
+            </indexterm>
+
             <literal>TIME</literal>
           </para>
 
@@ -1030,20 +1042,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>YEAR data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>YEAR</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic YEAR type
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>YEAR data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>YEAR</secondary>
+            </indexterm>
+
             <literal>YEAR[(2|4)]</literal>
           </para>
 
@@ -1170,48 +1182,48 @@
       <itemizedlist>
 
         <listitem>
-          <indexterm type="type">
-            <primary>CHAR data type</primary>
-          </indexterm>
+          <remark>
+            description_for_help_topic CHAR NATIONAL CHARACTER NCHAR
+            BINARY
+          </remark>
 
-          <indexterm type="type">
-            <primary>NATIONAL CHAR data type</primary>
-          </indexterm>
+          <para>
+            <indexterm type="type">
+              <primary>CHAR data type</primary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>NCHAR data type</primary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>NATIONAL CHAR data type</primary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>CHARACTER data type</primary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>NCHAR data type</primary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHAR</secondary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>CHARACTER data type</primary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>NATIONAL CHAR</secondary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHAR</secondary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>NCHAR</secondary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>NATIONAL CHAR</secondary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHARACTER</secondary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>NCHAR</secondary>
+            </indexterm>
 
-          <remark>
-            description_for_help_topic CHAR NATIONAL CHARACTER NCHAR
-            BINARY
-          </remark>
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHARACTER</secondary>
+            </indexterm>
 
-          <para>
             <literal>[NATIONAL] CHAR(<replaceable>M</replaceable>)
             [BINARY | ASCII | UNICODE]</literal>
           </para>
@@ -1308,48 +1320,48 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>VARCHAR data type</primary>
-          </indexterm>
+          <remark>
+            description_for_help_topic VARCHAR BINARY NATIONAL VARYING
+            CHARACTER VARCHARACTER
+          </remark>
 
-          <indexterm type="type">
-            <primary>CHARACTER VARYING data type</primary>
-          </indexterm>
+          <para>
+            <indexterm type="type">
+              <primary>VARCHAR data type</primary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>CHAR VARYING data type</primary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>CHARACTER VARYING data type</primary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>VARCHARACTER data type</primary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>CHAR VARYING data type</primary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>VARCHAR</secondary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>VARCHARACTER data type</primary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHARACTER VARYING</secondary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>VARCHAR</secondary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHAR VARYING</secondary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHARACTER VARYING</secondary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>VARCHARACTER</secondary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHAR VARYING</secondary>
+            </indexterm>
 
-          <remark>
-            description_for_help_topic VARCHAR BINARY NATIONAL VARYING
-            CHARACTER VARCHARACTER
-          </remark>
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>VARCHARACTER</secondary>
+            </indexterm>
 
-          <para>
             <literal>[NATIONAL] VARCHAR(<replaceable>M</replaceable>)
             [BINARY]</literal>
           </para>
@@ -1401,20 +1413,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BINARY data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BINARY</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BINARY
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BINARY data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BINARY</secondary>
+            </indexterm>
+
            
<literal>BINARY(<replaceable>M</replaceable>)</literal>
           </para>
 
@@ -1434,20 +1446,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>VARBINARY data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>VARBINARY</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic VARBINARY
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>VARBINARY data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>VARBINARY</secondary>
+            </indexterm>
+
            
<literal>VARBINARY(<replaceable>M</replaceable>)</literal>
           </para>
 
@@ -1467,20 +1479,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TINYBLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TINYBLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TINYBLOB
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TINYBLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TINYBLOB</secondary>
+            </indexterm>
+
             <literal>TINYBLOB</literal>
           </para>
 
@@ -1495,20 +1507,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TINYTEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TINYTEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TINYTEXT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TINYTEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TINYTEXT</secondary>
+            </indexterm>
+
             <literal>TINYTEXT</literal>
           </para>
 
@@ -1523,20 +1535,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BLOB type
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BLOB</secondary>
+            </indexterm>
+
            
<literal>BLOB[(<replaceable>M</replaceable>)]</literal>
           </para>
 
@@ -1559,20 +1571,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TEXT type
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TEXT</secondary>
+            </indexterm>
+
            
<literal>TEXT[(<replaceable>M</replaceable>)]</literal>
           </para>
 
@@ -1596,20 +1608,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>MEDIUMBLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>MEDIUMBLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic MEDIUMBLOB
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>MEDIUMBLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>MEDIUMBLOB</secondary>
+            </indexterm>
+
             <literal>MEDIUMBLOB</literal>
           </para>
 
@@ -1624,20 +1636,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>MEDIUMTEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>MEDIUMTEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic MEDIUMTEXT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>MEDIUMTEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>MEDIUMTEXT</secondary>
+            </indexterm>
+
             <literal>MEDIUMTEXT</literal>
           </para>
 
@@ -1653,20 +1665,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>LONGBLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>LONGBLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic LONGBLOB LONG LONGBINARY
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>LONGBLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>LONGBLOB</secondary>
+            </indexterm>
+
             <literal>LONGBLOB</literal>
           </para>
 
@@ -1687,20 +1699,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>LONGTEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>LONGTEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic LONGTEXT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>LONGTEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>LONGTEXT</secondary>
+            </indexterm>
+
             <literal>LONGTEXT</literal>
           </para>
 
@@ -1721,20 +1733,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>ENUM data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>ENUM</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic ENUM
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>ENUM data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>ENUM</secondary>
+            </indexterm>
+
            
<literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
           </para>
 
@@ -1756,20 +1768,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>SET data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>SET</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic type SET
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>SET data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>SET</secondary>
+            </indexterm>
+
            
<literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
           </para>
 
@@ -1965,9 +1977,9 @@
       in bits following the keyword <literal>FLOAT</literal> in
       parentheses. The MySQL implementation also supports this optional
       precision specification, but the precision value is used only to
-      determine storage size. A precision from 0 to 23 results in
+      determine storage size. A precision from 0 to 23 results in a
       four-byte single-precision <literal>FLOAT</literal> column. A
-      precision from 24 to 53 results in eight-byte double-precision
+      precision from 24 to 53 results in an eight-byte double-precision
       <literal>DOUBLE</literal> column.
     </para>
 
@@ -3984,6 +3996,10 @@
         TEXT in 4.1.
       </remark>
 
+      <remark>
+        description_for_help_topic BLOB
+      </remark>
+
       <indexterm type="type">
         <primary>BLOB data type</primary>
       </indexterm>
@@ -4010,10 +4026,6 @@
         <primary>data type</primary>
         <secondary>LONG</secondary>
       </indexterm>
-
-      <remark>
-        description_for_help_topic BLOB
-      </remark>
 
       <para>
         A <literal>BLOB</literal> is a binary large object that can hold

--- 1.26/refman/column-types.xml	2005-09-02 18:22:59 -05:00
+++ 1.27/refman/column-types.xml	2005-09-02 20:47:59 -05:00
@@ -185,9 +185,9 @@
 
       <itemizedlist>
 
+        <listitem>
 <!--  description_for_help_topic BIT -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>BIT data type</primary>
@@ -214,13 +214,13 @@
             <literal>BDB</literal>. Before 5.0.3,
<literal>BIT</literal>
             is a synonym for <literal>TINYINT(1)</literal>.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic TINYINT  BOOLEAN BOOL ZEROFILL UNSIGNED INT1 -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>TINYINT data type</primary>
@@ -241,13 +241,13 @@
             unsigned range is <literal>0</literal> to
             <literal>255</literal>.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic BOOLEAN  BOOL -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>BOOLEAN data type</primary>
@@ -281,13 +281,13 @@
             In the future, full boolean type handling will be introduced
             in accordance with standard SQL.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic SMALLINT  INT2 -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>SMALLINT data type</primary>
@@ -308,13 +308,13 @@
             unsigned range is <literal>0</literal> to
             <literal>65535</literal>.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic MEDIUMINT  INT3 MIDDLEINT -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>MEDIUMINT data type</primary>
@@ -335,13 +335,13 @@
             The unsigned range is <literal>0</literal> to
             <literal>16777215</literal>.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic INT  INT4 UNSIGNED ZEROFILL INTEGER -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>INT data type</primary>
@@ -382,13 +382,13 @@
           <para>
             This is a synonym for <literal>INT</literal>.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic BIGINT  UNSIGNED ZEROFILL INT8 -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>BIGINT data type</primary>
@@ -495,18 +495,14 @@
             </listitem>
 
           </itemizedlist>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic FLOAT  UNSIGNED ZEROFILL FLOAT4 -->
 
-        <listitem>
           <para>
-            <indexterm type="concept">
-              <primary>floating-point number</primary>
-            </indexterm>
-
             <indexterm type="type">
               <primary>FLOAT data type</primary>
             </indexterm>
@@ -516,41 +512,35 @@
               <secondary>FLOAT</secondary>
             </indexterm>
 
-            <literal>FLOAT(<replaceable>p</replaceable>) [UNSIGNED]
-            [ZEROFILL]</literal>
+           
<literal>FLOAT[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
+            [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
           <para>
-            A floating-point number. <replaceable>p</replaceable>
-            represents the precision. It can be from 0 to 24 for a
-            single-precision floating-point number and from 25 to 53 for
-            a double-precision floating-point number. These types are
-            like the <literal>FLOAT</literal> and
-            <literal>DOUBLE</literal> types described immediately
-            following. <literal>FLOAT(p)</literal> has the same range as
-            the corresponding <literal>FLOAT</literal> and
-            <literal>DOUBLE</literal> types, but the display width and
-            number of decimals are undefined.
+            A small (single-precision) floating-point number. Allowable
+            values are <literal>-3.402823466E+38</literal> to
+            <literal>-1.175494351E-38</literal>,
<literal>0</literal>,
+            and <literal>1.175494351E-38</literal> to
+            <literal>3.402823466E+38</literal>. These are the
+            theoretical limits, based on the IEEE standard. The actual
+            range might be slightly smaller depending on your hardware
+            or operating system.
           </para>
 
           <para>
-            As of MySQL 3.23, this is a true floating-point value. In
-            earlier MySQL versions,
-           
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
-            always has two decimals.
+            <replaceable>M</replaceable> is the total number of decimal
+            digits and <replaceable>D</replaceable> is the number of
+            digits following the decimal point. If
+            <replaceable>M</replaceable> and
+            <replaceable>D</replaceable> are omitted, values are stored
+            to the limits allowed by the hardware. A single-precision
+            floating-point number is accurate to approximately 7 decimal
+            places.
           </para>
 
           <para>
-            <indexterm type="concept">
-              <primary>ODBC compatibility</primary>
-            </indexterm>
-
-            <indexterm type="concept">
-              <primary>compatibility</primary>
-              <secondary>with ODBC</secondary>
-            </indexterm>
-
-            This syntax is provided for ODBC compatibility.
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
           </para>
 
           <para>
@@ -559,56 +549,70 @@
             done with double precision. See
             <xref linkend="no-matching-rows"/>.
           </para>
+
+<!--  end_description_for_help_topic -->
         </listitem>
 
         <listitem>
+<!--  description_for_help_topic DOUBLE  FLOAT8 UNSIGNED ZEROFILL PRECISION REAL
-->
+
           <para>
             <indexterm type="type">
+              <primary>DOUBLE data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
               <primary>FLOAT data type</primary>
             </indexterm>
 
             <indexterm type="type">
               <primary>data type</primary>
+              <secondary>DOUBLE</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
               <secondary>FLOAT</secondary>
             </indexterm>
 
-           
<literal>FLOAT[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
+           
<literal>DOUBLE[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
             [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
           <para>
-            A small (single-precision) floating-point number. Allowable
-            values are <literal>-3.402823466E+38</literal> to
-            <literal>-1.175494351E-38</literal>,
<literal>0</literal>,
-            and <literal>1.175494351E-38</literal> to
-            <literal>3.402823466E+38</literal>. (These are the
+            A normal-size (double-precision) floating-point number.
+            Allowable values are
+            <literal>-1.7976931348623157E+308</literal> to
+            <literal>-2.2250738585072014E-308</literal>,
+            <literal>0</literal>, and
+            <literal>2.2250738585072014E-308</literal> to
+            <literal>1.7976931348623157E+308</literal>. These are the
             theoretical limits, based on the IEEE standard. The actual
             range might be slightly smaller depending on your hardware
-            or operating system.)
+            or operating system.
+          </para>
+
+          <para>
+            <replaceable>M</replaceable> is the total number of decimal
+            digits and <replaceable>D</replaceable> is the number of
+            digits following the decimal point. If
+            <replaceable>M</replaceable> and
+            <replaceable>D</replaceable> are omitted, values are stored
+            to the limits allowed by the hardware. A double-precision
+            floating-point number is accurate to approximately 15
+            decimal places.
           </para>
 
           <para>
             If <literal>UNSIGNED</literal> is specified, negative values
-            are disallowed. <replaceable>M</replaceable> is the display
-            width and <replaceable>D</replaceable> is the number of
-            significant digits. <literal>FLOAT</literal> without
-            arguments or
-           
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
-            (where <replaceable>p</replaceable> is in the range from 0
-            to 24) stands for a single-precision floating-point number.
-            A single-precision floating-point number is accurate to
-            approximately 7 decimal places.
+            are disallowed.
           </para>
         </listitem>
 
-<!--  end_description_for_help_topic -->
-
-<!--  description_for_help_topic DOUBLE  FLOAT8 UNSIGNED ZEROFILL PRECISION REAL
-->
-
         <listitem>
           <para>
-            <indexterm type="type">
-              <primary>DOUBLE data type</primary>
+            <indexterm type="concept">
+              <primary>floating-point number</primary>
             </indexterm>
 
             <indexterm type="type">
@@ -617,43 +621,50 @@
 
             <indexterm type="type">
               <primary>data type</primary>
-              <secondary>DOUBLE</secondary>
-            </indexterm>
-
-            <indexterm type="type">
-              <primary>data type</primary>
               <secondary>FLOAT</secondary>
             </indexterm>
 
-           
<literal>DOUBLE[(<replaceable>M</replaceable>,<replaceable>B</replaceable>)]
-            [UNSIGNED] [ZEROFILL]</literal>
+            <literal>FLOAT(<replaceable>p</replaceable>) [UNSIGNED]
+            [ZEROFILL]</literal>
           </para>
 
           <para>
-            A normal-size (double-precision) floating-point number.
-            Allowable values are
-            <literal>-1.7976931348623157E+308</literal> to
-            <literal>-2.2250738585072014E-308</literal>,
-            <literal>0</literal>, and
-            <literal>2.2250738585072014E-308</literal> to
-            <literal>1.7976931348623157E+308</literal>. (These are the
-            theoretical limits, based on the IEEE standard. The actual
-            range might be slightly smaller depending on your hardware
-            or operating system.)
+            A floating-point number. <replaceable>p</replaceable>
+            represents the precision in bits, but MySQL uses this value
+            only to determine whether to give the resulting column a
+            data type of <literal>FLOAT</literal> or
+            <literal>DOUBLE</literal>. If
<replaceable>p</replaceable>
+            is from 0 to 24, the data type becomes
+            <literal>FLOAT</literal> with no
+            <replaceable>M</replaceable> or
<replaceable>D</replaceable>
+            values. If <replaceable>p</replaceable> is from 25 to 53,
+            the data type becomes <literal>DOUBLE</literal> with no
+            <replaceable>M</replaceable> or
<replaceable>D</replaceable>
+            values. The range of the resulting column is the same as for
+            the single-precision <literal>FLOAT</literal> or
+            double-precision <literal>DOUBLE</literal> data types
+            described earlier in this section.
           </para>
 
           <para>
-            If <literal>UNSIGNED</literal> is specified, negative values
-            are disallowed. <replaceable>M</replaceable> is the display
-            width and <replaceable>B</replaceable> is the number of bits
-            of precision. <literal>DOUBLE</literal> without arguments or
+            As of MySQL 3.23, this data type holds true floating-point
+            values. In earlier MySQL versions,
            
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
-            (where <replaceable>p</replaceable> is in the range from 25
-            to 53) stands for a double-precision floating-point number.
-            A single-precision floating-point number is accurate to
-            approximately 7 decimal places; a double-precision
-            floating-point number is accurate to approximately 15
-            decimal places.
+            always has two decimals.
+          </para>
+
+          <para>
+            <indexterm type="concept">
+              <primary>ODBC compatibility</primary>
+            </indexterm>
+
+            <indexterm type="concept">
+              <primary>compatibility</primary>
+              <secondary>with ODBC</secondary>
+            </indexterm>
+
+           
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
+            syntax is provided for ODBC compatibility.
           </para>
         </listitem>
 
@@ -692,13 +703,13 @@
             <literal>FLOAT</literal> rather than
             <literal>DOUBLE</literal>.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic DECIMAL  ZEROFILL UNSIGNED NUMERIC DEC FIXED -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>DECIMAL data type</primary>
@@ -713,19 +724,16 @@
             [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
-<!--
-  TODO: update for precision math
--->
-
           <para>
             For MySQL 5.0.3 and above:
           </para>
 
           <para>
             A packed <quote>exact</quote> fixed-point number.
-            <replaceable>M</replaceable> is the total number of digits
-            and <replaceable>D</replaceable> is the number of decimals.
-            The decimal point and (for negative numbers) the
+            <replaceable>M</replaceable> is the total number of decimal
+            digits (the precision) and <replaceable>D</replaceable> is
+            the number of decimal digits after the decimal point (the
+            scale). The decimal point and (for negative numbers) the
             &lsquo;<literal>-</literal>&rsquo; sign are not counted
in
             <replaceable>M</replaceable>. If
             <replaceable>D</replaceable> is 0, values have no decimal
@@ -733,14 +741,14 @@
             (<replaceable>M</replaceable>) for
             <literal>DECIMAL</literal> is 64. The maximum number of
             supported decimals (<replaceable>D</replaceable>) is 30. If
-            <literal>UNSIGNED</literal> is specified, negative values
-            are disallowed.
+            <replaceable>D</replaceable> is omitted, the default is 0.
+            If <replaceable>M</replaceable> is omitted, the default is
+            10.
           </para>
 
           <para>
-            If <replaceable>D</replaceable> is omitted, the default is
-            0. If <replaceable>M</replaceable> is omitted, the default
-            is 10.
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
           </para>
 
           <para>
@@ -758,25 +766,26 @@
             <literal>CHAR</literal> column;
<quote>unpacked</quote>
             means the number is stored as a string, using one character
             for each digit of the value. <replaceable>M</replaceable> is
-            the total number of digits and <replaceable>D</replaceable>
-            is the number of decimals. The decimal point and (for
-            negative numbers) the &lsquo;<literal>-</literal>&rsquo;
-            sign are not counted in <replaceable>M</replaceable>,
-            although space for them is reserved. If
-            <replaceable>D</replaceable> is 0, values have no decimal
-            point or fractional part. The maximum range of
-            <literal>DECIMAL</literal> values is the same as for
-            <literal>DOUBLE</literal>, but the actual range for a given
-            <literal>DECIMAL</literal> column may be constrained by the
-            choice of <replaceable>M</replaceable> and
-            <replaceable>D</replaceable>. If
<literal>UNSIGNED</literal>
-            is specified, negative values are disallowed.
+            the total number of decimal digits and
+            <replaceable>D</replaceable> is the number of decimal digits
+            after the decimal point. The decimal point and (for negative
+            numbers) the &lsquo;<literal>-</literal>&rsquo; sign are
not
+            counted in <replaceable>M</replaceable>, although space for
+            them is reserved. If <replaceable>D</replaceable> is 0,
+            values have no decimal point or fractional part. The maximum
+            range of <literal>DECIMAL</literal> values is the same as
+            for <literal>DOUBLE</literal>, but the actual range for a
+            given <literal>DECIMAL</literal> column may be constrained
+            by the choice of <replaceable>M</replaceable> and
+            <replaceable>D</replaceable>. If
+            <replaceable>D</replaceable> is omitted, the default is 0.
+            If <replaceable>M</replaceable> is omitted, the default is
+            10.
           </para>
 
           <para>
-            If <replaceable>D</replaceable> is omitted, the default is
-            0. If <replaceable>M</replaceable> is omitted, the default
-            is 10.
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
           </para>
 
           <para>
@@ -833,9 +842,9 @@
             <literal>FIXED</literal> synonym was added in MySQL 4.1.0
             for compatibility with other servers.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
       </itemizedlist>
 
@@ -854,9 +863,9 @@
 
       <itemizedlist>
 
+        <listitem>
 <!--  description_for_help_topic DATE  DATE -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>DATE data type</primary>
@@ -879,13 +888,13 @@
             assign values to <literal>DATE</literal> columns using
             either strings or numbers.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic DATETIME -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>DATETIME data type</primary>
@@ -908,13 +917,13 @@
             to <literal>DATETIME</literal> columns using either strings
             or numbers.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic TIMESTAMP  TIMESTAMP -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>TIMESTAMP data type</primary>
@@ -992,13 +1001,13 @@
             see <xref linkend="timestamp-pre-4-1"/> and
             <xref linkend="timestamp-4-1"/>.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic TIME  TIME -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>TIME data type</primary>
@@ -1020,13 +1029,13 @@
             assign values to <literal>TIME</literal> columns using
             either strings or numbers.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic YEAR type -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>YEAR data type</primary>
@@ -1054,9 +1063,9 @@
             numbers. The <literal>YEAR</literal> type is unavailable
             prior to MySQL 3.22.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
       </itemizedlist>
 
@@ -1160,9 +1169,9 @@
 
       <itemizedlist>
 
+        <listitem>
 <!--  description_for_help_topic CHAR  NATIONAL CHARACTER NCHAR BINARY -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>CHAR data type</primary>
@@ -1289,13 +1298,13 @@
           <para>
             This is a synonym for <literal>CHAR(1)</literal>.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic VARCHAR  BINARY NATIONAL VARYING CHARACTER
VARCHARACTER -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>VARCHAR data type</primary>
@@ -1389,13 +1398,13 @@
             length prefix is two bytes if the <literal>VARCHAR</literal>
             column is declared with a length greater than 255.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic BINARY -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>BINARY data type</primary>
@@ -1418,13 +1427,13 @@
           <para>
             This type was added in MySQL 4.1.2.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic VARBINARY -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>VARBINARY data type</primary>
@@ -1447,13 +1456,13 @@
           <para>
             This type was added in MySQL 4.1.2.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic TINYBLOB -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>TINYBLOB data type</primary>
@@ -1471,13 +1480,13 @@
             A <literal>BLOB</literal> column with a maximum length of
             255 (2<superscript>8</superscript> &minus; 1) bytes.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic TINYTEXT -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>TINYTEXT data type</primary>
@@ -1495,13 +1504,13 @@
             A <literal>TEXT</literal> column with a maximum length of
             255 (2<superscript>8</superscript> &minus; 1) characters.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic BLOB type -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>BLOB data type</primary>
@@ -1527,13 +1536,13 @@
             largest enough to hold values <replaceable>M</replaceable>
             bytes long.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic TEXT type -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>TEXT data type</primary>
@@ -1560,13 +1569,13 @@
             largest enough to hold values <replaceable>M</replaceable>
             characters long.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic MEDIUMBLOB -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>MEDIUMBLOB data type</primary>
@@ -1584,13 +1593,13 @@
             A <literal>BLOB</literal> column with a maximum length of
             16,777,215 (2<superscript>24</superscript> &minus; 1) bytes.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic MEDIUMTEXT -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>MEDIUMTEXT data type</primary>
@@ -1609,13 +1618,13 @@
             16,777,215 (2<superscript>24</superscript> &minus; 1)
             characters.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic LONGBLOB  LONG LONGBINARY -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>LONGBLOB data type</primary>
@@ -1639,13 +1648,13 @@
             columns depends on the configured maximum packet size in the
             client/server protocol and available memory.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic LONGTEXT -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>LONGTEXT data type</primary>
@@ -1669,13 +1678,13 @@
             columns depends on the configured maximum packet size in the
             client/server protocol and available memory.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic ENUM -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>ENUM data type</primary>
@@ -1700,13 +1709,13 @@
             distinct values. <literal>ENUM</literal> values are
             represented internally as integers.
           </para>
-        </listitem>
 
 <!--  end_description_for_help_topic -->
+        </listitem>
 
+        <listitem>
 <!--  description_for_help_topic type SET -->
 
-        <listitem>
           <para>
             <indexterm type="type">
               <primary>SET data type</primary>
@@ -1729,12 +1738,12 @@
             have a maximum of 64 members. <literal>SET</literal> values
             are represented internally as integers.
           </para>
+
+<!--  end_description_for_help_topic -->
         </listitem>
 
       </itemizedlist>
 
-<!--  end_description_for_help_topic -->
-
     </section>
 
   </section>
@@ -1924,9 +1933,9 @@
       in bits following the keyword <literal>FLOAT</literal> in
       parentheses. The MySQL implementation also supports this optional
       precision specification, but the precision value is used only to
-      determine storage size. A precision from 0 to 23 results in
+      determine storage size. A precision from 0 to 23 results in a
       four-byte single-precision <literal>FLOAT</literal> column. A
-      precision from 24 to 53 results in eight-byte double-precision
+      precision from 24 to 53 results in an eight-byte double-precision
       <literal>DOUBLE</literal> column.
     </para>
 
@@ -4056,9 +4065,9 @@
         types, <literal>TINYBLOB</literal>,
<literal>BLOB</literal>,
         <literal>MEDIUMBLOB</literal>, and
<literal>LONGBLOB</literal>,
         differ only in the maximum length of the values they can hold.
+      </para>
 
 <!--  end_description_for_help_topic -->
-      </para>
 
       <para>
         See <xref linkend="storage-requirements"/>.

--- 1.19/refman-5.0/column-types.xml	2005-09-02 18:22:59 -05:00
+++ 1.20/refman-5.0/column-types.xml	2005-09-02 20:47:58 -05:00
@@ -188,11 +188,11 @@
 
       <itemizedlist>
 
-        <remark>
-          description_for_help_topic BIT
-        </remark>
-
         <listitem>
+          <remark>
+            description_for_help_topic BIT
+          </remark>
+
           <para>
             <indexterm type="type">
               <primary>BIT data type</primary>
@@ -226,21 +226,21 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TINYINT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TINYINT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TINYINT BOOLEAN BOOL ZEROFILL
             UNSIGNED INT1
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TINYINT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TINYINT</secondary>
+            </indexterm>
+
             <literal>TINYINT[(<replaceable>M</replaceable>)] [UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -258,29 +258,29 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BOOLEAN data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>BOOL data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BOOLEAN</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BOOL</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BOOLEAN BOOL
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BOOLEAN data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>BOOL data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BOOLEAN</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BOOL</secondary>
+            </indexterm>
+
             <literal>BOOL</literal> , <literal>BOOLEAN</literal>
           </para>
 
@@ -301,20 +301,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>SMALLINT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>SMALLINT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic SMALLINT INT2
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>SMALLINT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>SMALLINT</secondary>
+            </indexterm>
+
             <literal>SMALLINT[(<replaceable>M</replaceable>)]
[UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -332,20 +332,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>MEDIUMINT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>MEDIUMINT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic MEDIUMINT INT3 MIDDLEINT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>MEDIUMINT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>MEDIUMINT</secondary>
+            </indexterm>
+
             <literal>MEDIUMINT[(<replaceable>M</replaceable>)]
             [UNSIGNED] [ZEROFILL]</literal>
           </para>
@@ -363,21 +363,21 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>INT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>INT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic INT INT4 UNSIGNED ZEROFILL
             INTEGER
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>INT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>INT</secondary>
+            </indexterm>
+
             <literal>INT[(<replaceable>M</replaceable>)] [UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -415,20 +415,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BIGINT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BIGINT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BIGINT UNSIGNED ZEROFILL INT8
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BIGINT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BIGINT</secondary>
+            </indexterm>
+
             <literal>BIGINT[(<replaceable>M</replaceable>)] [UNSIGNED]
             [ZEROFILL]</literal>
           </para>
@@ -532,56 +532,49 @@
         </listitem>
 
         <listitem>
-          <indexterm type="concept">
-            <primary>floating-point number</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>FLOAT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>FLOAT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic FLOAT UNSIGNED ZEROFILL FLOAT4
           </remark>
 
           <para>
-            <literal>FLOAT(<replaceable>p</replaceable>) [UNSIGNED]
-            [ZEROFILL]</literal>
+            <indexterm type="type">
+              <primary>FLOAT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>FLOAT</secondary>
+            </indexterm>
+
+           
<literal>FLOAT[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
+            [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
           <para>
-            A floating-point number. <replaceable>p</replaceable>
-            represents the precision. It can be from 0 to 24 for a
-            single-precision floating-point number and from 25 to 53 for
-            a double-precision floating-point number. These types are
-            like the <literal>FLOAT</literal> and
-            <literal>DOUBLE</literal> types described immediately
-            following. <literal>FLOAT(p)</literal> has the same range as
-            the corresponding <literal>FLOAT</literal> and
-            <literal>DOUBLE</literal> types, but the display width and
-            number of decimals are undefined.
+            A small (single-precision) floating-point number. Allowable
+            values are <literal>-3.402823466E+38</literal> to
+            <literal>-1.175494351E-38</literal>,
<literal>0</literal>,
+            and <literal>1.175494351E-38</literal> to
+            <literal>3.402823466E+38</literal>. These are the
+            theoretical limits, based on the IEEE standard. The actual
+            range might be slightly smaller depending on your hardware
+            or operating system.
           </para>
 
           <para>
-            In MySQL 5.0, this is a true floating-point value.
+            <replaceable>M</replaceable> is the total number of decimal
+            digits and <replaceable>D</replaceable> is the number of
+            digits following the decimal point. If
+            <replaceable>M</replaceable> and
+            <replaceable>D</replaceable> are omitted, values are stored
+            to the limits allowed by the hardware. A single-precision
+            floating-point number is accurate to approximately 7 decimal
+            places.
           </para>
 
           <para>
-            <indexterm type="concept">
-              <primary>ODBC compatibility</primary>
-            </indexterm>
-
-            <indexterm type="concept">
-              <primary>compatibility</primary>
-              <secondary>with ODBC</secondary>
-            </indexterm>
-
-            This syntax is provided for ODBC compatibility.
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
           </para>
 
           <para>
@@ -590,45 +583,68 @@
             done with double precision. See
             <xref linkend="no-matching-rows"/>.
           </para>
+
+          <remark>
+            end_description_for_help_topic
+          </remark>
         </listitem>
 
         <listitem>
+          <remark>
+            description_for_help_topic DOUBLE FLOAT8 UNSIGNED ZEROFILL
+            PRECISION REAL
+          </remark>
+
           <para>
             <indexterm type="type">
+              <primary>DOUBLE data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
               <primary>FLOAT data type</primary>
             </indexterm>
 
             <indexterm type="type">
               <primary>data type</primary>
+              <secondary>DOUBLE</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
               <secondary>FLOAT</secondary>
             </indexterm>
 
-           
<literal>FLOAT[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
+           
<literal>DOUBLE[(<replaceable>M</replaceable>,<replaceable>D</replaceable>)]
             [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
           <para>
-            A small (single-precision) floating-point number. Allowable
-            values are <literal>-3.402823466E+38</literal> to
-            <literal>-1.175494351E-38</literal>,
<literal>0</literal>,
-            and <literal>1.175494351E-38</literal> to
-            <literal>3.402823466E+38</literal>. (These are the
+            A normal-size (double-precision) floating-point number.
+            Allowable values are
+            <literal>-1.7976931348623157E+308</literal> to
+            <literal>-2.2250738585072014E-308</literal>,
+            <literal>0</literal>, and
+            <literal>2.2250738585072014E-308</literal> to
+            <literal>1.7976931348623157E+308</literal>. These are the
             theoretical limits, based on the IEEE standard. The actual
             range might be slightly smaller depending on your hardware
-            or operating system.)
+            or operating system.
+          </para>
+
+          <para>
+            <replaceable>M</replaceable> is the total number of decimal
+            digits and <replaceable>D</replaceable> is the number of
+            digits following the decimal point. If
+            <replaceable>M</replaceable> and
+            <replaceable>D</replaceable> are omitted, values are stored
+            to the limits allowed by the hardware. A double-precision
+            floating-point number is accurate to approximately 15
+            decimal places.
           </para>
 
           <para>
             If <literal>UNSIGNED</literal> is specified, negative values
-            are disallowed. <replaceable>M</replaceable> is the display
-            width and <replaceable>D</replaceable> is the number of
-            significant digits. <literal>FLOAT</literal> without
-            arguments or
-           
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
-            (where <replaceable>p</replaceable> is in the range from 0
-            to 24) stands for a single-precision floating-point number.
-            A single-precision floating-point number is accurate to
-            approximately 7 decimal places.
+            are disallowed.
           </para>
 
           <remark>
@@ -637,59 +653,54 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DOUBLE data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>FLOAT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>DOUBLE</secondary>
-          </indexterm>
+          <para>
+            <indexterm type="concept">
+              <primary>floating-point number</primary>
+            </indexterm>
 
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>FLOAT</secondary>
-          </indexterm>
+            <indexterm type="type">
+              <primary>FLOAT data type</primary>
+            </indexterm>
 
-          <remark>
-            description_for_help_topic DOUBLE FLOAT8 UNSIGNED ZEROFILL
-            PRECISION REAL
-          </remark>
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>FLOAT</secondary>
+            </indexterm>
 
-          <para>
-           
<literal>DOUBLE[(<replaceable>M</replaceable>,<replaceable>B</replaceable>)]
-            [UNSIGNED] [ZEROFILL]</literal>
+            <literal>FLOAT(<replaceable>p</replaceable>) [UNSIGNED]
+            [ZEROFILL]</literal>
           </para>
 
           <para>
-            A normal-size (double-precision) floating-point number.
-            Allowable values are
-            <literal>-1.7976931348623157E+308</literal> to
-            <literal>-2.2250738585072014E-308</literal>,
-            <literal>0</literal>, and
-            <literal>2.2250738585072014E-308</literal> to
-            <literal>1.7976931348623157E+308</literal>. (These are the
-            theoretical limits, based on the IEEE standard. The actual
-            range might be slightly smaller depending on your hardware
-            or operating system.)
+            A floating-point number. <replaceable>p</replaceable>
+            represents the precision in bits, but MySQL uses this value
+            only to determine whether to give the resulting column a
+            data type of <literal>FLOAT</literal> or
+            <literal>DOUBLE</literal>. If
<replaceable>p</replaceable>
+            is from 0 to 24, the data type becomes
+            <literal>FLOAT</literal> with no
+            <replaceable>M</replaceable> or
<replaceable>D</replaceable>
+            values. If <replaceable>p</replaceable> is from 25 to 53,
+            the data type becomes <literal>DOUBLE</literal> with no
+            <replaceable>M</replaceable> or
<replaceable>D</replaceable>
+            values. The range of the resulting column is the same as for
+            the single-precision <literal>FLOAT</literal> or
+            double-precision <literal>DOUBLE</literal> data types
+            described earlier in this section.
           </para>
 
           <para>
-            If <literal>UNSIGNED</literal> is specified, negative values
-            are disallowed. <replaceable>M</replaceable> is the display
-            width and <replaceable>B</replaceable> is the number of bits
-            of precision. <literal>DOUBLE</literal> without arguments or
+            <indexterm type="concept">
+              <primary>ODBC compatibility</primary>
+            </indexterm>
+
+            <indexterm type="concept">
+              <primary>compatibility</primary>
+              <secondary>with ODBC</secondary>
+            </indexterm>
+
            
<literal>FLOAT(<replaceable>p</replaceable>)</literal>
-            (where <replaceable>p</replaceable> is in the range from 25
-            to 53) stands for a double-precision floating-point number.
-            A single-precision floating-point number is accurate to
-            approximately 7 decimal places; a double-precision
-            floating-point number is accurate to approximately 15
-            decimal places.
+            syntax is provided for ODBC compatibility.
           </para>
         </listitem>
 
@@ -728,45 +739,38 @@
             <literal>FLOAT</literal> rather than
             <literal>DOUBLE</literal>.
           </para>
-
-          <remark>
-            end_description_for_help_topic
-          </remark>
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DECIMAL data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>DECIMAL</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic DECIMAL ZEROFILL UNSIGNED NUMERIC
             DEC FIXED
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>DECIMAL data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>DECIMAL</secondary>
+            </indexterm>
+
            
<literal>DECIMAL[(<replaceable>M</replaceable>[,<replaceable>D</replaceable>])]
             [UNSIGNED] [ZEROFILL]</literal>
           </para>
 
-          <remark role="todo">
-            update for precision math
-          </remark>
-
           <para>
             For MySQL 5.0.3 and above:
           </para>
 
           <para>
-            A packed, exact fixed-point number.
-            <replaceable>M</replaceable> is the total number of digits
-            and <replaceable>D</replaceable> is the number of decimals.
-            The decimal point and (for negative numbers) the
+            A packed <quote>exact</quote> fixed-point number.
+            <replaceable>M</replaceable> is the total number of decimal
+            digits (the precision) and <replaceable>D</replaceable> is
+            the number of decimal digits after the decimal point (the
+            scale). The decimal point and (for negative numbers) the
             &lsquo;<literal>-</literal>&rsquo; sign are not counted
in
             <replaceable>M</replaceable>. If
             <replaceable>D</replaceable> is 0, values have no decimal
@@ -774,14 +778,14 @@
             (<replaceable>M</replaceable>) for
             <literal>DECIMAL</literal> is 64. The maximum number of
             supported decimals (<replaceable>D</replaceable>) is 30. If
-            <literal>UNSIGNED</literal> is specified, negative values
-            are disallowed.
+            <replaceable>D</replaceable> is omitted, the default is 0.
+            If <replaceable>M</replaceable> is omitted, the default is
+            10.
           </para>
 
           <para>
-            If <replaceable>D</replaceable> is omitted, the default is
-            0. If <replaceable>M</replaceable> is omitted, the default
-            is 10.
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
           </para>
 
           <para>
@@ -796,11 +800,12 @@
 
           <para>
             An unpacked fixed-point number. Behaves like a
-            <literal>CHAR</literal> column; "unpacked" means that the
-            number is stored as a string, using one character for each
-            digit of the value. <replaceable>M</replaceable> is the
-            total number of digits and <replaceable>D</replaceable> is
-            the number of decimals. The decimal point and (for negative
+            <literal>CHAR</literal> column;
<quote>unpacked</quote>
+            means the number is stored as a string, using one character
+            for each digit of the value. <replaceable>M</replaceable> is
+            the total number of decimal digits and
+            <replaceable>D</replaceable> is the number of decimal digits
+            after the decimal point. The decimal point and (for negative
             numbers) the &lsquo;<literal>-</literal>&rsquo; sign are
not
             counted in <replaceable>M</replaceable>, although space for
             them is reserved. If <replaceable>D</replaceable> is 0,
@@ -809,14 +814,15 @@
             for <literal>DOUBLE</literal>, but the actual range for a
             given <literal>DECIMAL</literal> column may be constrained
             by the choice of <replaceable>M</replaceable> and
-            <replaceable>D</replaceable>. If
<literal>UNSIGNED</literal>
-            is specified, negative values are disallowed.
+            <replaceable>D</replaceable>. If
+            <replaceable>D</replaceable> is omitted, the default is 0.
+            If <replaceable>M</replaceable> is omitted, the default is
+            10.
           </para>
 
           <para>
-            If <replaceable>D</replaceable> is omitted, the default is
-            0. If <replaceable>M</replaceable> is omitted, the default
-            is 10.
+            If <literal>UNSIGNED</literal> is specified, negative values
+            are disallowed.
           </para>
         </listitem>
 
@@ -886,20 +892,20 @@
       <itemizedlist>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DATE data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>DATE</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic DATE DATE
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>DATE data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>DATE</secondary>
+            </indexterm>
+
             <literal>DATE</literal>
           </para>
 
@@ -919,20 +925,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>DATETIME data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>DATETIME</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic DATETIME
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>DATETIME data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>DATETIME</secondary>
+            </indexterm>
+
             <literal>DATETIME</literal>
           </para>
 
@@ -952,20 +958,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TIMESTAMP data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TIMESTAMP</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TIMESTAMP TIMESTAMP
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TIMESTAMP data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TIMESTAMP</secondary>
+            </indexterm>
+
            
<literal>TIMESTAMP[(<replaceable>M</replaceable>)]</literal>
           </para>
 
@@ -1001,20 +1007,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TIME data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TIME</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TIME TIME
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TIME data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TIME</secondary>
+            </indexterm>
+
             <literal>TIME</literal>
           </para>
 
@@ -1033,20 +1039,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>YEAR data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>YEAR</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic YEAR type
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>YEAR data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>YEAR</secondary>
+            </indexterm>
+
             <literal>YEAR[(2|4)]</literal>
           </para>
 
@@ -1170,48 +1176,48 @@
       <itemizedlist>
 
         <listitem>
-          <indexterm type="type">
-            <primary>CHAR data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>NATIONAL CHAR data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>NCHAR data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>CHARACTER data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHAR</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>NATIONAL CHAR</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>NCHAR</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHARACTER</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic CHAR NATIONAL CHARACTER NCHAR
             BINARY
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>CHAR data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>NATIONAL CHAR data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>NCHAR data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>CHARACTER data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHAR</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>NATIONAL CHAR</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>NCHAR</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHARACTER</secondary>
+            </indexterm>
+
             <literal>[NATIONAL] CHAR(<replaceable>M</replaceable>)
             [BINARY | ASCII | UNICODE]</literal>
           </para>
@@ -1304,48 +1310,48 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>VARCHAR data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>CHARACTER VARYING data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>CHAR VARYING data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>VARCHARACTER data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>VARCHAR</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHARACTER VARYING</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>CHAR VARYING</secondary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>VARCHARACTER</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic VARCHAR BINARY NATIONAL VARYING
             CHARACTER VARCHARACTER
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>VARCHAR data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>CHARACTER VARYING data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>CHAR VARYING data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>VARCHARACTER data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>VARCHAR</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHARACTER VARYING</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>CHAR VARYING</secondary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>VARCHARACTER</secondary>
+            </indexterm>
+
             <literal>[NATIONAL] VARCHAR(<replaceable>M</replaceable>)
             [BINARY]</literal>
           </para>
@@ -1407,20 +1413,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BINARY data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BINARY</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BINARY
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BINARY data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BINARY</secondary>
+            </indexterm>
+
            
<literal>BINARY(<replaceable>M</replaceable>)</literal>
           </para>
 
@@ -1436,20 +1442,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>VARBINARY data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>VARBINARY</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic VARBINARY
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>VARBINARY data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>VARBINARY</secondary>
+            </indexterm>
+
            
<literal>VARBINARY(<replaceable>M</replaceable>)</literal>
           </para>
 
@@ -1465,20 +1471,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TINYBLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TINYBLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TINYBLOB
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TINYBLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TINYBLOB</secondary>
+            </indexterm>
+
             <literal>TINYBLOB</literal>
           </para>
 
@@ -1493,20 +1499,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TINYTEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TINYTEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TINYTEXT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TINYTEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TINYTEXT</secondary>
+            </indexterm>
+
             <literal>TINYTEXT</literal>
           </para>
 
@@ -1521,20 +1527,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>BLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>BLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic BLOB type
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>BLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>BLOB</secondary>
+            </indexterm>
+
            
<literal>BLOB[(<replaceable>M</replaceable>)]</literal>
           </para>
 
@@ -1557,20 +1563,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>TEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>TEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic TEXT type
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>TEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>TEXT</secondary>
+            </indexterm>
+
            
<literal>TEXT[(<replaceable>M</replaceable>)]</literal>
           </para>
 
@@ -1594,20 +1600,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>MEDIUMBLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>MEDIUMBLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic MEDIUMBLOB
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>MEDIUMBLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>MEDIUMBLOB</secondary>
+            </indexterm>
+
             <literal>MEDIUMBLOB</literal>
           </para>
 
@@ -1622,20 +1628,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>MEDIUMTEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>MEDIUMTEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic MEDIUMTEXT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>MEDIUMTEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>MEDIUMTEXT</secondary>
+            </indexterm>
+
             <literal>MEDIUMTEXT</literal>
           </para>
 
@@ -1651,20 +1657,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>LONGBLOB data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>LONGBLOB</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic LONGBLOB LONG LONGBINARY
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>LONGBLOB data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>LONGBLOB</secondary>
+            </indexterm>
+
             <literal>LONGBLOB</literal>
           </para>
 
@@ -1683,20 +1689,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>LONGTEXT data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>LONGTEXT</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic LONGTEXT
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>LONGTEXT data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>LONGTEXT</secondary>
+            </indexterm>
+
             <literal>LONGTEXT</literal>
           </para>
 
@@ -1715,20 +1721,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>ENUM data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>ENUM</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic ENUM
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>ENUM data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>ENUM</secondary>
+            </indexterm>
+
            
<literal>ENUM('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
           </para>
 
@@ -1750,20 +1756,20 @@
         </listitem>
 
         <listitem>
-          <indexterm type="type">
-            <primary>SET data type</primary>
-          </indexterm>
-
-          <indexterm type="type">
-            <primary>data type</primary>
-            <secondary>SET</secondary>
-          </indexterm>
-
           <remark>
             description_for_help_topic type SET
           </remark>
 
           <para>
+            <indexterm type="type">
+              <primary>SET data type</primary>
+            </indexterm>
+
+            <indexterm type="type">
+              <primary>data type</primary>
+              <secondary>SET</secondary>
+            </indexterm>
+
            
<literal>SET('<replaceable>value1</replaceable>','<replaceable>value2</replaceable>',...)</literal>
           </para>
 
@@ -1969,9 +1975,9 @@
       in bits following the keyword <literal>FLOAT</literal> in
       parentheses. The MySQL implementation also supports this optional
       precision specification, but the precision value is used only to
-      determine storage size. A precision from 0 to 23 results in
+      determine storage size. A precision from 0 to 23 results in a
       four-byte single-precision <literal>FLOAT</literal> column. A
-      precision from 24 to 53 results in eight-byte double-precision
+      precision from 24 to 53 results in an eight-byte double-precision
       <literal>DOUBLE</literal> column.
     </para>
 
@@ -3658,6 +3664,10 @@
         TEXT since 4.0.
       </remark>
 
+      <remark>
+        description_for_help_topic BLOB
+      </remark>
+
       <indexterm type="type">
         <primary>BLOB data type</primary>
       </indexterm>
@@ -3684,10 +3694,6 @@
         <primary>data type</primary>
         <secondary>LONG</secondary>
       </indexterm>
-
-      <remark>
-        description_for_help_topic BLOB
-      </remark>
 
       <para>
         A <literal>BLOB</literal> is a binary large object that can hold
Thread
bk commit - mysqldoc@docsrva tree (paul:1.3465)paul3 Sep