svn commit - mysqldoc@docsrva: r11460 - in trunk: . refman-5.0 refman-5.1 refman-6.0

[paul.dubois]

Author: paul
Date: 2008-07-31 01:32:02 +0200 (Thu, 31 Jul 2008)
New Revision: 11460

Log:
 r33129@frost:  paul | 2008-07-30 18:29:46 -0500
 Fix documentation bug:
 Bug#37438: multiple TIMESTAMP columns


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

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


Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2008-07-30 23:31:55 UTC (rev 11459)
+++ trunk/refman-5.0/data-types.xml	2008-07-30 23:32:02 UTC (rev 11460)
Changed blocks: 1, Lines Added: 13, Lines Deleted: 0; 1002 bytes

@@ -3581,6 +3581,19 @@
 
         </itemizedlist>
 
+        <note>
+          <para>
+            The examples that use <literal>DEFAULT 0</literal> will not
+            work if the <literal>NO_ZERO_DATE</literal> SQL mode is
+            enabled because that mode causes <quote>zero</quote> date
+            values (specified as <literal>0</literal>,
+            <literal>'0000-00-00</literal>, or <literal>'0000-00-00
+            00:00:00'</literal>) to be rejected. Be aware that the
+            <literal>TRADITIONAL</literal> SQL mode includes
+            <literal>NO_ZERO_DATE</literal>.
+          </para>
+        </note>
+
         <para>
           <literal>TIMESTAMP</literal> columns are <literal>NOT
           NULL</literal> by default, cannot contain


Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2008-07-30 23:31:55 UTC (rev 11459)
+++ trunk/refman-5.1/data-types.xml	2008-07-30 23:32:02 UTC (rev 11460)
Changed blocks: 1, Lines Added: 13, Lines Deleted: 0; 1002 bytes

@@ -3400,6 +3400,19 @@
 
         </itemizedlist>
 
+        <note>
+          <para>
+            The examples that use <literal>DEFAULT 0</literal> will not
+            work if the <literal>NO_ZERO_DATE</literal> SQL mode is
+            enabled because that mode causes <quote>zero</quote> date
+            values (specified as <literal>0</literal>,
+            <literal>'0000-00-00</literal>, or <literal>'0000-00-00
+            00:00:00'</literal>) to be rejected. Be aware that the
+            <literal>TRADITIONAL</literal> SQL mode includes
+            <literal>NO_ZERO_DATE</literal>.
+          </para>
+        </note>
+
         <para>
           <literal>TIMESTAMP</literal> columns are <literal>NOT
           NULL</literal> by default, cannot contain


Modified: trunk/refman-6.0/data-types.xml
===================================================================
--- trunk/refman-6.0/data-types.xml	2008-07-30 23:31:55 UTC (rev 11459)
+++ trunk/refman-6.0/data-types.xml	2008-07-30 23:32:02 UTC (rev 11460)
Changed blocks: 1, Lines Added: 13, Lines Deleted: 0; 1002 bytes

@@ -3397,6 +3397,19 @@
 
         </itemizedlist>
 
+        <note>
+          <para>
+            The examples that use <literal>DEFAULT 0</literal> will not
+            work if the <literal>NO_ZERO_DATE</literal> SQL mode is
+            enabled because that mode causes <quote>zero</quote> date
+            values (specified as <literal>0</literal>,
+            <literal>'0000-00-00</literal>, or <literal>'0000-00-00
+            00:00:00'</literal>) to be rejected. Be aware that the
+            <literal>TRADITIONAL</literal> SQL mode includes
+            <literal>NO_ZERO_DATE</literal>.
+          </para>
+        </note>
+
         <para>
           <literal>TIMESTAMP</literal> columns are <literal>NOT
           NULL</literal> by default, cannot contain