svn commit - mysqldoc@docsrva: r1663 - in trunk: . refman-4.1 refman-5.0 refman-5.1

[paul]

Author: paul
Date: 2006-03-24 20:03:03 +0100 (Fri, 24 Mar 2006)
New Revision: 1663

Log:
 r4099@kite-hub:  paul | 2006-03-24 12:06:23 -0600
 General revisions.


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


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

Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2006-03-24 19:02:49 UTC (rev 1662)
+++ trunk/refman-4.1/data-types.xml	2006-03-24 19:03:03 UTC (rev 1663)
@@ -139,7 +139,7 @@
 
       <para>
         A summary of the numeric data types follows. For additional
-        information, see <xref linkend="numeric-types"/>. Type storage
+        information, see <xref linkend="numeric-types"/>. Storage
         requirements are given in
         <xref linkend="storage-requirements"/>.
       </para>
@@ -870,8 +870,8 @@
 
       <para>
         A summary of the temporal data types follows. For additional
-        information, see <xref linkend="date-and-time-types"/>. Type
-        storage requirements are given in
+        information, see <xref linkend="date-and-time-types"/>. Storage
+        requirements are given in
         <xref linkend="storage-requirements"/>.
       </para>
 
@@ -1129,7 +1129,7 @@
 
       <para>
         A summary of the string data types follows. For additional
-        information, see <xref linkend="string-types"/>. Type storage
+        information, see <xref linkend="string-types"/>. Storage
         requirements are given in
         <xref linkend="storage-requirements"/>.
       </para>
@@ -1912,7 +1912,7 @@
 
         <listitem>
           <para>
-            For numeric types other than those declared with the
+            For numeric types other than integer types declared with the
             <literal>AUTO_INCREMENT</literal> attribute, the default is
             <literal>0</literal>. For an
             <literal>AUTO_INCREMENT</literal> column, the default value
@@ -2090,7 +2090,7 @@
     <para>
       When used in conjunction with the optional extension attribute
       <literal>ZEROFILL</literal>, the default padding of spaces is
-      replaced with zeros. For example, for a column declared as
+      replaced with zeroes. For example, for a column declared as
       <literal>INT(5) ZEROFILL</literal>, a value of
       <literal>4</literal> is retrieved as
<literal>00004</literal>.
       Note that if you store larger values than the display width in an
@@ -2692,7 +2692,7 @@
         <literal>YYMMDD</literal> or
<literal>YYMMDDHHMMSS</literal>
         format and that the year is given by the first 2 digits. Numbers
         that are not one of these lengths are interpreted as though
-        padded with leading zeros to the closest length.
+        padded with leading zeroes to the closest length.
       </para>
 
       <indexterm>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-03-24 19:02:49 UTC (rev 1662)
+++ trunk/refman-4.1/database-administration.xml	2006-03-24 19:03:03 UTC (rev 1663)
@@ -17241,7 +17241,7 @@
             programs such as <command>ps</command> that may be invoked
             by other users to display command lines. MySQL clients
             typically overwrite the command-line password argument with
-            zeros during their initialization sequence. However, there
+            zeroes during their initialization sequence. However, there
             is still a brief interval during which the value is visible.
             On some systems this strategy is ineffective, anyway, and
             the password remains visible to <command>ps</command>.

Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2006-03-24 19:02:49 UTC (rev 1662)
+++ trunk/refman-5.0/data-types.xml	2006-03-24 19:03:03 UTC (rev 1663)
@@ -139,7 +139,7 @@
 
       <para>
         A summary of the numeric data types follows. For additional
-        information, see <xref linkend="numeric-types"/>. Type storage
+        information, see <xref linkend="numeric-types"/>. Storage
         requirements are given in
         <xref linkend="storage-requirements"/>.
       </para>
@@ -906,8 +906,8 @@
 
       <para>
         A summary of the temporal data types follows. For additional
-        information, see <xref linkend="date-and-time-types"/>. Type
-        storage requirements are given in
+        information, see <xref linkend="date-and-time-types"/>. Storage
+        requirements are given in
         <xref linkend="storage-requirements"/>.
       </para>
 
@@ -1037,8 +1037,8 @@
 
           <para>
             A <literal>TIMESTAMP</literal> value is returned as a string
-            in the format <literal>'YYYY-MM-DD HH:MM:SS'</literal> whose
-            display width is fixed at 19 characters. To obtain the value
+            in the format <literal>'YYYY-MM-DD HH:MM:SS'</literal> with
+            a display width fixed at 19 characters. To obtain the value
             as a number, you should add <literal>+0</literal> to the
             timestamp column.
           </para>
@@ -1133,7 +1133,7 @@
 
       <para>
         A summary of the string data types follows. For additional
-        information, see <xref linkend="string-types"/>. Type storage
+        information, see <xref linkend="string-types"/>. Storage
         requirements are given in
         <xref linkend="storage-requirements"/>.
       </para>
@@ -1922,7 +1922,7 @@
 
         <listitem>
           <para>
-            For numeric types other than those declared with the
+            For numeric types other than integer types declared with the
             <literal>AUTO_INCREMENT</literal> attribute, the default is
             <literal>0</literal>. For an
             <literal>AUTO_INCREMENT</literal> column, the default value
@@ -2179,7 +2179,7 @@
     <para>
       When used in conjunction with the optional extension attribute
       <literal>ZEROFILL</literal>, the default padding of spaces is
-      replaced with zeros. For example, for a column declared as
+      replaced with zeroes. For example, for a column declared as
       <literal>INT(5) ZEROFILL</literal>, a value of
       <literal>4</literal> is retrieved as
<literal>00004</literal>.
       Note that if you store larger values than the display width in an
@@ -2804,7 +2804,7 @@
         <literal>YYMMDD</literal> or
<literal>YYMMDDHHMMSS</literal>
         format and that the year is given by the first 2 digits. Numbers
         that are not one of these lengths are interpreted as though
-        padded with leading zeros to the closest length.
+        padded with leading zeroes to the closest length.
       </para>
 
       <indexterm>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-03-24 19:02:49 UTC (rev 1662)
+++ trunk/refman-5.0/database-administration.xml	2006-03-24 19:03:03 UTC (rev 1663)
@@ -19848,7 +19848,7 @@
             programs such as <command>ps</command> that may be invoked
             by other users to display command lines. MySQL clients
             typically overwrite the command-line password argument with
-            zeros during their initialization sequence. However, there
+            zeroes during their initialization sequence. However, there
             is still a brief interval during which the value is visible.
             On some systems this strategy is ineffective, anyway, and
             the password remains visible to <command>ps</command>.

Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2006-03-24 19:02:49 UTC (rev 1662)
+++ trunk/refman-5.1/data-types.xml	2006-03-24 19:03:03 UTC (rev 1663)
@@ -139,7 +139,7 @@
 
       <para>
         A summary of the numeric data types follows. For additional
-        information, see <xref linkend="numeric-types"/>. Type storage
+        information, see <xref linkend="numeric-types"/>. Storage
         requirements are given in
         <xref linkend="storage-requirements"/>.
       </para>
@@ -862,8 +862,8 @@
 
       <para>
         A summary of the temporal data types follows. For additional
-        information, see <xref linkend="date-and-time-types"/>. Type
-        storage requirements are given in
+        information, see <xref linkend="date-and-time-types"/>. Storage
+        requirements are given in
         <xref linkend="storage-requirements"/>.
       </para>
 
@@ -993,8 +993,8 @@
 
           <para>
             A <literal>TIMESTAMP</literal> value is returned as a string
-            in the format <literal>'YYYY-MM-DD HH:MM:SS'</literal> whose
-            display width is fixed at 19 characters. To obtain the value
+            in the format <literal>'YYYY-MM-DD HH:MM:SS'</literal> with
+            a display width fixed at 19 characters. To obtain the value
             as a number, you should add <literal>+0</literal> to the
             timestamp column.
           </para>
@@ -1089,7 +1089,7 @@
 
       <para>
         A summary of the string data types follows. For additional
-        information, see <xref linkend="string-types"/>. Type storage
+        information, see <xref linkend="string-types"/>. Storage
         requirements are given in
         <xref linkend="storage-requirements"/>.
       </para>
@@ -1898,6 +1898,44 @@
         <literal>DEFAULT</literal> clause.
       </para>
 
+      <para>
+        Implicit defaults are defined as follows:
+      </para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>
+            For numeric types other than integer types declared with the
+            <literal>AUTO_INCREMENT</literal> attribute, the default is
+            <literal>0</literal>. For an
+            <literal>AUTO_INCREMENT</literal> column, the default value
+            is the next value in the sequence.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            For date and time types other than
+            <literal>TIMESTAMP</literal>, the default is the appropriate
+            <quote>zero</quote> value for the type. For the first
+            <literal>TIMESTAMP</literal> column in a table, the default
+            value is the current date and time. See
+            <xref linkend="date-and-time-types"/>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            For string types other than <literal>ENUM</literal>, the
+            default value is the empty string. For
+            <literal>ENUM</literal>, the default is the first
+            enumeration value.
+          </para>
+        </listitem>
+
+      </itemizedlist>
+
     </section>
 
   </section>
@@ -2042,7 +2080,7 @@
     <para>
       When used in conjunction with the optional extension attribute
       <literal>ZEROFILL</literal>, the default padding of spaces is
-      replaced with zeros. For example, for a column declared as
+      replaced with zeroes. For example, for a column declared as
       <literal>INT(5) ZEROFILL</literal>, a value of
       <literal>4</literal> is retrieved as
<literal>00004</literal>.
       Note that if you store larger values than the display width in an
@@ -2653,7 +2691,7 @@
         <literal>YYMMDD</literal> or
<literal>YYMMDDHHMMSS</literal>
         format and that the year is given by the first 2 digits. Numbers
         that are not one of these lengths are interpreted as though
-        padded with leading zeros to the closest length.
+        padded with leading zeroes to the closest length.
       </para>
 
       <indexterm>