Author: paul
Date: 2006-04-19 21:37:09 +0200 (Wed, 19 Apr 2006)
New Revision: 1874
Log:
r6774@polar: paul | 2006-04-19 14:08:09 -0500
Clarify allowable default function names for TIMESTAMP. (Bug#17817)
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
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:6773
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9568
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4545
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:6774
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9568
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4545
Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml 2006-04-19 19:36:51 UTC (rev 1873)
+++ trunk/refman-4.1/data-types.xml 2006-04-19 19:37:09 UTC (rev 1874)
@@ -3422,10 +3422,15 @@
<para>
Any of <literal>CURRENT_TIMESTAMP</literal>,
- <literal>CURRENT_TIMESTAMP()</literal>, or
- <literal>NOW()</literal> can be used in the
+ <literal>CURRENT_TIMESTAMP()</literal>,
+ <literal>NOW()</literal>, <literal>LOCALTIME</literal>, or
+ <literal>LOCALTIME()</literal> can be used in the
<literal>DEFAULT</literal> and <literal>ON UPDATE</literal>
clauses. They all mean <quote>the current timestamp.</quote>
+ (<literal>UTC_TIMESTAMP</literal> is not allowed. Its range of
+ values does not align with those of the
+ <literal>TIMESTAMP</literal> column anyway unless the current
+ time zone is <literal>UTC</literal>.)
</para>
<para>
@@ -5053,7 +5058,7 @@
<literal>TEXT</literal> column accounts for only five to nine
bytes toward this size.
</para>
-
+
<para>
<emphasis role="bold">Important</emphasis>: For tables using the
<literal>NDBCluster</literal> storage engine, there is the factor
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2006-04-19 19:36:51 UTC (rev 1873)
+++ trunk/refman-5.0/data-types.xml 2006-04-19 19:37:09 UTC (rev 1874)
@@ -3181,11 +3181,15 @@
<listitem>
<para>
Any of <literal>CURRENT_TIMESTAMP</literal>,
- <literal>CURRENT_TIMESTAMP()</literal>, or
- <literal>NOW()</literal> can be used in the
+ <literal>CURRENT_TIMESTAMP()</literal>,
+ <literal>NOW()</literal>, <literal>LOCALTIME</literal>, or
+ <literal>LOCALTIME()</literal> can be used in the
<literal>DEFAULT</literal> and <literal>ON
UPDATE</literal> clauses. They all mean <quote>the current
- timestamp.</quote>
+ timestamp.</quote> (<literal>UTC_TIMESTAMP</literal> is
+ not allowed. Its range of values does not align with those
+ of the <literal>TIMESTAMP</literal> column anyway unless
+ the current time zone is <literal>UTC</literal>.)
</para>
<para>
@@ -4863,7 +4867,7 @@
<literal>TEXT</literal> column accounts for only five to nine
bytes toward this size.
</para>
-
+
<para>
<emphasis role="bold">Important</emphasis>: For tables using the
<literal>NDBCluster</literal> storage engine, there is the factor
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2006-04-19 19:36:51 UTC (rev 1873)
+++ trunk/refman-5.1/data-types.xml 2006-04-19 19:37:09 UTC (rev 1874)
@@ -3057,11 +3057,15 @@
<listitem>
<para>
Any of <literal>CURRENT_TIMESTAMP</literal>,
- <literal>CURRENT_TIMESTAMP()</literal>, or
- <literal>NOW()</literal> can be used in the
+ <literal>CURRENT_TIMESTAMP()</literal>,
+ <literal>NOW()</literal>, <literal>LOCALTIME</literal>, or
+ <literal>LOCALTIME()</literal> can be used in the
<literal>DEFAULT</literal> and <literal>ON
UPDATE</literal> clauses. They all mean <quote>the current
- timestamp.</quote>
+ timestamp.</quote> (<literal>UTC_TIMESTAMP</literal> is
+ not allowed. Its range of values does not align with those
+ of the <literal>TIMESTAMP</literal> column anyway unless
+ the current time zone is <literal>UTC</literal>.)
</para>
<para>
@@ -4658,7 +4662,7 @@
<literal>TEXT</literal> column accounts for only five to nine
bytes toward this size.
</para>
-
+
<para>
<emphasis role="bold">Important</emphasis>: For tables using the
<literal>NDBCluster</literal> storage engine, there is the factor
@@ -5051,7 +5055,7 @@
<literal>latin1</literal> character set requires 8 bytes (rather
than 6 bytes for the same column value in a
<literal>MyISAM</literal> table). This represents a change in
- behavior from earlier versions of <literal>NDBCLUSTER</literal>,
+ behavior from earlier versions of <literal>NDBCLUSTER</literal>,
where a <literal>VARCHAR(50)</literal> column would require 52
bytes storage per record regardless of the length of the string
being stored.
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1874 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 19 Apr |
