List:Commits« Previous MessageNext Message »
From:paul Date:January 18 2006 3:48am
Subject:svn commit - mysqldoc@docsrva: r895 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-18 04:48:26 +0100 (Wed, 18 Jan 2006)
New Revision: 895

Log:
 r6351@frost:  paul | 2006-01-17 21:48:15 -0600
 Cleanup revisions.


Modified:
   trunk/
   trunk/refman-4.1/data-types.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.1/data-types.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6344
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2265
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6351
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2265

Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2006-01-18 03:33:43 UTC (rev 894)
+++ trunk/refman-4.1/data-types.xml	2006-01-18 03:48:26 UTC (rev 895)
@@ -104,7 +104,7 @@
         Applies to floating-point and fixed-point types and indicates
         the number of digits following the decimal point. The maximum
         possible value is 30, but should be no greater than
-        <replaceable>M</replaceable>-2.
+        <replaceable>M</replaceable>&minus;2.
       </para>
     </listitem>
 
@@ -3307,8 +3307,8 @@
           the same as for the first <literal>TIMESTAMP</literal> column,
           except that you cannot omit both of the
           <literal>DEFAULT</literal> and <literal>ON UPDATE</literal>
-          clauses. If you do that, no automatic initialization or
-          updating occurs.
+          clauses. If you do so, no automatic initialization or updating
+          occurs.
         </para>
 
         <para>
@@ -3335,10 +3335,10 @@
           converted back to the current time zone for retrieval. As long
           as the time zone setting remains the same, you get back the
           same value you store. If you store a
-          <literal>TIMESTAMP</literal> value, then change the time zone
-          and retrieve the value, it is different than the value you
-          stored. This occurs because the same time zone is not used for
-          conversion in both directions. The current time zone is
+          <literal>TIMESTAMP</literal> value, and then change the time
+          zone and retrieve the value, it is different than the value
+          you stored. This occurs because the same time zone is not used
+          for conversion in both directions. The current time zone is
           available as the value of the <literal>time_zone</literal>
           system variable.
         </para>
@@ -4406,9 +4406,8 @@
             <literal>NULL</literal>, the <literal>NULL</literal> value
             is a legal value for the column, and the default value is
             <literal>NULL</literal>. If an <literal>ENUM</literal>
-            column is declared <literal>NOT NULL</literal>, then its
-            default value is the first element of the list of allowed
-            values.
+            column is declared <literal>NOT NULL</literal>, its default
+            value is the first element of the list of allowed values.
           </para>
         </listitem>
 
@@ -4552,11 +4551,11 @@
         'a')</literal>. The empty string sorts before non-empty strings,
         and <literal>NULL</literal> values sort before all other
         enumeration values. If you expect sorting to be done
-        alphabetically, then you should specify the
-        <literal>ENUM</literal> list in alphabetical order. You can also
-        use <literal>GROUP BY CAST(col AS CHAR)</literal> or
-        <literal>GROUP BY CONCAT(col)</literal> to make sure that the
-        column is sorted lexically rather than by index number.
+        alphabetically, you should specify the <literal>ENUM</literal>
+        list in alphabetical order. You can also use <literal>GROUP BY
+        CAST(col AS CHAR)</literal> or <literal>GROUP BY
+        CONCAT(col)</literal> to make sure that the column is sorted
+        lexically rather than by index number.
       </para>
 
       <para>
@@ -4687,8 +4686,8 @@
 
       <para>
         If you assign a value of <literal>9</literal> to this column,
-        that is <literal>1001</literal> in binary, then the first and
-        fourth <literal>SET</literal> members <literal>'a'</literal> and
+        that is <literal>1001</literal> in binary, the first and fourth
+        <literal>SET</literal> members <literal>'a'</literal> and
         <literal>'d'</literal> are selected and the resulting value is
         <literal>'a,d'</literal>.
       </para>
@@ -4865,7 +4864,7 @@
 
     <para>
       If a <literal>MyISAM</literal> or <literal>ISAM</literal> table
-      includes any variable-length data types, the record format is also
+      includes any variable-length data types, the row format is also
       variable length. When a table is created, MySQL may, under certain
       conditions, change a column from a variable-length type to a
       fixed-length type or vice versa. See

Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2006-01-18 03:33:43 UTC (rev 894)
+++ trunk/refman-5.0/data-types.xml	2006-01-18 03:48:26 UTC (rev 895)
@@ -108,7 +108,7 @@
         Applies to floating-point and fixed-point types and indicates
         the number of digits following the decimal point. The maximum
         possible value is 30, but should be no greater than
-        <replaceable>M</replaceable>-2.
+        <replaceable>M</replaceable>&minus;2.
       </para>
     </listitem>
 
@@ -1613,9 +1613,9 @@
 
           <para>
             An optional length <replaceable>M</replaceable> can be given
-            for this type. If this is done, then MySQL will create the
-            column as the smallest <literal>BLOB</literal> type large
-            enough to hold values of <replaceable>M</replaceable> bytes.
+            for this type. If this is done, MySQL will create the column
+            as the smallest <literal>BLOB</literal> type large enough to
+            hold values of <replaceable>M</replaceable> bytes.
           </para>
 
           <remark role="help-description-end"/>
@@ -3032,8 +3032,8 @@
               rules are the same as for the first
               <literal>TIMESTAMP</literal> column, except that you
               cannot omit both of the <literal>DEFAULT</literal> and
-              <literal>ON UPDATE</literal> clauses. If you do so, then
-              no automatic initialization or updating occurs.
+              <literal>ON UPDATE</literal> clauses. If you do so, no
+              automatic initialization or updating occurs.
             </para>
 
             <para>
@@ -4659,11 +4659,10 @@
 
     <para>
       If a <literal>MyISAM</literal> table includes any variable-length
-      data types, the record format is also variable length. When a
-      table is created, MySQL may, under certain conditions, change a
-      column from a variable-length type to a fixed-length type or vice
-      versa. See <xref linkend="silent-column-changes"/>, for more
-      information.
+      data types, the row format is also variable length. When a table
+      is created, MySQL may, under certain conditions, change a column
+      from a variable-length type to a fixed-length type or vice versa.
+      See <xref linkend="silent-column-changes"/>, for more information.
     </para>
 
     <indexterm>
@@ -5075,17 +5074,17 @@
     <para>
       <literal>TEXT</literal> and <literal>BLOB</literal> columns are
       implemented differently in the NDB Cluster storage engine, wherein
-      each record in a <literal>TEXT</literal> column is made up of two
+      each row in a <literal>TEXT</literal> column is made up of two
       separate parts. One of these is of fixed size (256 bytes), and is
       actually stored in the original table. The other consists of any
       data in excess of 256 bytes, which stored in a hidden table. The
-      records in this second table are always 2,000 bytes long. This
-      means that the size of a <literal>TEXT</literal> column is 256 if
+      rows in this second table are always 2,000 bytes long. This means
+      that the size of a <literal>TEXT</literal> column is 256 if
       <replaceable>size</replaceable> &lt;= 256 (where
-      <replaceable>size</replaceable> represents the size of the
-      record); otherwise, the size is 256 +
-      <replaceable>size</replaceable> + (2000 &minus;
-      (<replaceable>size</replaceable> &minus; 256) % 2000).
+      <replaceable>size</replaceable> represents the size of the row);
+      otherwise, the size is 256 + <replaceable>size</replaceable> +
+      (2000 &minus; (<replaceable>size</replaceable> &minus; 256) %
+      2000).
     </para>
 
     <indexterm>
@@ -5134,10 +5133,9 @@
       For optimum storage, you should try to use the most precise type
       in all cases. For example, if an integer column is used for values
       in the range from <literal>1</literal> to
-      <literal>99999</literal>, then <literal>MEDIUMINT
-      UNSIGNED</literal> is the best type. Of the types that represent
-      all the required values, this type uses the least amount of
-      storage.
+      <literal>99999</literal>, <literal>MEDIUMINT UNSIGNED</literal> is
+      the best type. Of the types that represent all the required
+      values, this type uses the least amount of storage.
     </para>
 
     <para>
@@ -5155,7 +5153,7 @@
       <literal>DOUBLE</literal> type may be good enough. For high
       precision, you can always convert to a fixed-point type stored in
       a <literal>BIGINT</literal>. This allows you to do all
-      calculations with 64-bit integers, then convert results back to
+      calculations with 64-bit integers and then convert results back to
       floating-point values as necessary.
     </para>
 

Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2006-01-18 03:33:43 UTC (rev 894)
+++ trunk/refman-5.1/data-types.xml	2006-01-18 03:48:26 UTC (rev 895)
@@ -108,7 +108,7 @@
         Applies to floating-point and fixed-point types and indicates
         the number of digits following the decimal point. The maximum
         possible value is 30, but should be no greater than
-        <replaceable>M</replaceable>-2.
+        <replaceable>M</replaceable>&minus;2.
       </para>
     </listitem>
 
@@ -1541,9 +1541,9 @@
 
           <para>
             An optional length <replaceable>M</replaceable> can be given
-            for this type. If this is done, then MySQL will create the
-            column as the smallest <literal>BLOB</literal> type large
-            enough to hold values of <replaceable>M</replaceable> bytes.
+            for this type. If this is done, MySQL will create the column
+            as the smallest <literal>BLOB</literal> type large enough to
+            hold values of <replaceable>M</replaceable> bytes.
           </para>
 
           <remark role="help-description-end"/>
@@ -2927,8 +2927,8 @@
               rules are the same as for the first
               <literal>TIMESTAMP</literal> column, except that you
               cannot omit both of the <literal>DEFAULT</literal> and
-              <literal>ON UPDATE</literal> clauses. If you do so, then
-              no automatic initialization or updating occurs.
+              <literal>ON UPDATE</literal> clauses. If you do so, no
+              automatic initialization or updating occurs.
             </para>
 
             <para>
@@ -4500,11 +4500,10 @@
 
     <para>
       If a <literal>MyISAM</literal> table includes any variable-length
-      data types, the record format is also variable length. When a
-      table is created, MySQL may, under certain conditions, change a
-      column from a variable-length type to a fixed-length type or vice
-      versa. See <xref linkend="silent-column-changes"/>, for more
-      information.
+      data types, the row format is also variable length. When a table
+      is created, MySQL may, under certain conditions, change a column
+      from a variable-length type to a fixed-length type or vice versa.
+      See <xref linkend="silent-column-changes"/>, for more information.
     </para>
 
     <indexterm>
@@ -4829,13 +4828,13 @@
     <para>
       For example, a <literal>VARCHAR(10)</literal> column can hold a
       string with a maximum length of 10. Assuming that the column uses
-      the latin-1 character set (1 byte per character), the actual
-      storage required is the length of the string
-      (<replaceable>L</replaceable>), plus 1 byte to record the length
-      of the string. For the string <literal>'abcd'</literal>,
+      the <literal>latin1</literal> character set (1 byte per
+      character), the actual storage required is the length of the
+      string (<replaceable>L</replaceable>), plus 1 byte to record the
+      length of the string. For the string <literal>'abcd'</literal>,
       <replaceable>L</replaceable> is 4 and the storage requirement is 5
       bytes. If the same column was instead declared as
-      <literal>VARCHAR(500)</literal>, then the string
+      <literal>VARCHAR(500)</literal>, the string
       <literal>'abcd'</literal> requires 4 &plus; 2 = 6 bytes &mdash; 2
       bytes rather than 1 because the length of the column is greater
       than 256 characters.
@@ -4895,17 +4894,17 @@
     <para>
       <literal>TEXT</literal> and <literal>BLOB</literal> columns are
       implemented differently in the NDB Cluster storage engine, wherein
-      each record in a <literal>TEXT</literal> column is made up of two
+      each row in a <literal>TEXT</literal> column is made up of two
       separate parts. One of these is of fixed size (256 bytes), and is
       actually stored in the original table. The other consists of any
       data in excess of 256 bytes, which stored in a hidden table. The
-      records in this second table are always 2,000 bytes long. This
-      means that the size of a <literal>TEXT</literal> column is 256 if
+      rows in this second table are always 2,000 bytes long. This means
+      that the size of a <literal>TEXT</literal> column is 256 if
       <replaceable>size</replaceable> &lt;= 256 (where
-      <replaceable>size</replaceable> represents the size of the
-      record); otherwise, the size is 256 +
-      <replaceable>size</replaceable> + (2000 &minus;
-      (<replaceable>size</replaceable> &minus; 256) % 2000).
+      <replaceable>size</replaceable> represents the size of the row);
+      otherwise, the size is 256 + <replaceable>size</replaceable> +
+      (2000 &minus; (<replaceable>size</replaceable> &minus; 256) %
+      2000).
     </para>
 
     <indexterm>
@@ -4954,10 +4953,9 @@
       For optimum storage, you should try to use the most precise type
       in all cases. For example, if an integer column is used for values
       in the range from <literal>1</literal> to
-      <literal>99999</literal>, then <literal>MEDIUMINT
-      UNSIGNED</literal> is the best type. Of the types that represent
-      all the required values, this type uses the least amount of
-      storage.
+      <literal>99999</literal>, <literal>MEDIUMINT UNSIGNED</literal> is
+      the best type. Of the types that represent all the required
+      values, this type uses the least amount of storage.
     </para>
 
     <para>
@@ -4974,7 +4972,7 @@
       <literal>DOUBLE</literal> type may be good enough. For high
       precision, you can always convert to a fixed-point type stored in
       a <literal>BIGINT</literal>. This allows you to do all
-      calculations with 64-bit integers, then convert results back to
+      calculations with 64-bit integers and then convert results back to
       floating-point values as necessary.
     </para>
 

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