Author: paul
Date: 2010-08-20 20:55:22 +0200 (Fri, 20 Aug 2010)
New Revision: 22366
Log:
r62530@frost: paul | 2010-08-20 13:08:10 -0500
Fix docs bug:
Bug#43151: default values doesn't mention implicit default for columns in pkey
Modified:
trunk/refman-5.0/data-types.xml
trunk/refman-5.1/data-types.xml
trunk/refman-5.5/data-types.xml
trunk/refman-5.6/data-types.xml
trunk/refman-6.0/data-types.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:41634
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:62526
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:41634
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:62530
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2010-08-20 17:37:30 UTC (rev 22365)
+++ trunk/refman-5.0/data-types.xml 2010-08-20 18:55:22 UTC (rev 22366)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 1; 1388 bytes
@@ -2251,7 +2251,20 @@
<para>
If the column cannot take <literal>NULL</literal> as the value,
MySQL defines the column with no explicit
- <literal>DEFAULT</literal> clause. For data entry, if an
+ <literal>DEFAULT</literal> clause. Exception: If the column is
+ defined as part of a <literal>PRIMARY KEY</literal> but not
+ explicitly as <literal>NOT NULL</literal>, MySQL creates it as a
+ <literal>NOT NULL</literal> column (because <literal>PRIMARY
+ KEY</literal> columns must be <literal>NOT NULL</literal>), but
+ also assigns it a <literal>DEFAULT</literal> clause using the
+ implicit default value. To prevent this, include an explicit
+ <literal>NOT NULL</literal> in the definition of any
+ <literal>PRIMARY KEY</literal> column.
+ </para>
+
+ <para>
+ For data entry for a <literal>NOT NULL</literal> column that has
+ no explicit <literal>DEFAULT</literal> clause, if an
<literal role="stmt">INSERT</literal> or
<literal role="stmt">REPLACE</literal> statement includes no
value for the column, or an
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2010-08-20 17:37:30 UTC (rev 22365)
+++ trunk/refman-5.1/data-types.xml 2010-08-20 18:55:22 UTC (rev 22366)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 1; 1388 bytes
@@ -2075,7 +2075,20 @@
<para>
If the column cannot take <literal>NULL</literal> as the value,
MySQL defines the column with no explicit
- <literal>DEFAULT</literal> clause. For data entry, if an
+ <literal>DEFAULT</literal> clause. Exception: If the column is
+ defined as part of a <literal>PRIMARY KEY</literal> but not
+ explicitly as <literal>NOT NULL</literal>, MySQL creates it as a
+ <literal>NOT NULL</literal> column (because <literal>PRIMARY
+ KEY</literal> columns must be <literal>NOT NULL</literal>), but
+ also assigns it a <literal>DEFAULT</literal> clause using the
+ implicit default value. To prevent this, include an explicit
+ <literal>NOT NULL</literal> in the definition of any
+ <literal>PRIMARY KEY</literal> column.
+ </para>
+
+ <para>
+ For data entry for a <literal>NOT NULL</literal> column that has
+ no explicit <literal>DEFAULT</literal> clause, if an
<literal role="stmt">INSERT</literal> or
<literal role="stmt">REPLACE</literal> statement includes no
value for the column, or an
Modified: trunk/refman-5.5/data-types.xml
===================================================================
--- trunk/refman-5.5/data-types.xml 2010-08-20 17:37:30 UTC (rev 22365)
+++ trunk/refman-5.5/data-types.xml 2010-08-20 18:55:22 UTC (rev 22366)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 1; 1388 bytes
@@ -2075,7 +2075,20 @@
<para>
If the column cannot take <literal>NULL</literal> as the value,
MySQL defines the column with no explicit
- <literal>DEFAULT</literal> clause. For data entry, if an
+ <literal>DEFAULT</literal> clause. Exception: If the column is
+ defined as part of a <literal>PRIMARY KEY</literal> but not
+ explicitly as <literal>NOT NULL</literal>, MySQL creates it as a
+ <literal>NOT NULL</literal> column (because <literal>PRIMARY
+ KEY</literal> columns must be <literal>NOT NULL</literal>), but
+ also assigns it a <literal>DEFAULT</literal> clause using the
+ implicit default value. To prevent this, include an explicit
+ <literal>NOT NULL</literal> in the definition of any
+ <literal>PRIMARY KEY</literal> column.
+ </para>
+
+ <para>
+ For data entry for a <literal>NOT NULL</literal> column that has
+ no explicit <literal>DEFAULT</literal> clause, if an
<literal role="stmt">INSERT</literal> or
<literal role="stmt">REPLACE</literal> statement includes no
value for the column, or an
Modified: trunk/refman-5.6/data-types.xml
===================================================================
--- trunk/refman-5.6/data-types.xml 2010-08-20 17:37:30 UTC (rev 22365)
+++ trunk/refman-5.6/data-types.xml 2010-08-20 18:55:22 UTC (rev 22366)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 1; 1388 bytes
@@ -2075,7 +2075,20 @@
<para>
If the column cannot take <literal>NULL</literal> as the value,
MySQL defines the column with no explicit
- <literal>DEFAULT</literal> clause. For data entry, if an
+ <literal>DEFAULT</literal> clause. Exception: If the column is
+ defined as part of a <literal>PRIMARY KEY</literal> but not
+ explicitly as <literal>NOT NULL</literal>, MySQL creates it as a
+ <literal>NOT NULL</literal> column (because <literal>PRIMARY
+ KEY</literal> columns must be <literal>NOT NULL</literal>), but
+ also assigns it a <literal>DEFAULT</literal> clause using the
+ implicit default value. To prevent this, include an explicit
+ <literal>NOT NULL</literal> in the definition of any
+ <literal>PRIMARY KEY</literal> column.
+ </para>
+
+ <para>
+ For data entry for a <literal>NOT NULL</literal> column that has
+ no explicit <literal>DEFAULT</literal> clause, if an
<literal role="stmt">INSERT</literal> or
<literal role="stmt">REPLACE</literal> statement includes no
value for the column, or an
Modified: trunk/refman-6.0/data-types.xml
===================================================================
--- trunk/refman-6.0/data-types.xml 2010-08-20 17:37:30 UTC (rev 22365)
+++ trunk/refman-6.0/data-types.xml 2010-08-20 18:55:22 UTC (rev 22366)
Changed blocks: 1, Lines Added: 14, Lines Deleted: 1; 1388 bytes
@@ -2075,7 +2075,20 @@
<para>
If the column cannot take <literal>NULL</literal> as the value,
MySQL defines the column with no explicit
- <literal>DEFAULT</literal> clause. For data entry, if an
+ <literal>DEFAULT</literal> clause. Exception: If the column is
+ defined as part of a <literal>PRIMARY KEY</literal> but not
+ explicitly as <literal>NOT NULL</literal>, MySQL creates it as a
+ <literal>NOT NULL</literal> column (because <literal>PRIMARY
+ KEY</literal> columns must be <literal>NOT NULL</literal>), but
+ also assigns it a <literal>DEFAULT</literal> clause using the
+ implicit default value. To prevent this, include an explicit
+ <literal>NOT NULL</literal> in the definition of any
+ <literal>PRIMARY KEY</literal> column.
+ </para>
+
+ <para>
+ For data entry for a <literal>NOT NULL</literal> column that has
+ no explicit <literal>DEFAULT</literal> clause, if an
<literal role="stmt">INSERT</literal> or
<literal role="stmt">REPLACE</literal> statement includes no
value for the column, or an
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r22366 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0 | paul.dubois | 20 Aug |