Author: paul
Date: 2006-04-20 00:40:10 +0200 (Thu, 20 Apr 2006)
New Revision: 1879
Log:
r9582@frost: paul | 2006-04-19 17:33:41 -0500
Add a couple more synonyms.
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:6782
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:6782
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9582
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 21:48:22 UTC (rev 1878)
+++ trunk/refman-4.1/data-types.xml 2006-04-19 22:40:10 UTC (rev 1879)
@@ -3421,10 +3421,12 @@
</para>
<para>
- Any of <literal>CURRENT_TIMESTAMP</literal>,
- <literal>CURRENT_TIMESTAMP()</literal>,
- <literal>NOW()</literal>, <literal>LOCALTIME</literal>, or
- <literal>LOCALTIME()</literal> can be used in the
+ <literal>CURRENT_TIMESTAMP</literal> or any of its synonyms
+ (<literal>CURRENT_TIMESTAMP()</literal>,
+ <literal>NOW()</literal>, <literal>LOCALTIME</literal>,
+ <literal>LOCALTIME()</literal>,
+ <literal>LOCALTIMESTAMP</literal>, or
+ <literal>LOCALTIMESTAMP()</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
Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml 2006-04-19 21:48:22 UTC (rev 1878)
+++ trunk/refman-5.0/data-types.xml 2006-04-19 22:40:10 UTC (rev 1879)
@@ -3180,10 +3180,12 @@
<listitem>
<para>
- Any of <literal>CURRENT_TIMESTAMP</literal>,
- <literal>CURRENT_TIMESTAMP()</literal>,
- <literal>NOW()</literal>, <literal>LOCALTIME</literal>, or
- <literal>LOCALTIME()</literal> can be used in the
+ <literal>CURRENT_TIMESTAMP</literal> or any of its
+ synonyms (<literal>CURRENT_TIMESTAMP()</literal>,
+ <literal>NOW()</literal>, <literal>LOCALTIME</literal>,
+ <literal>LOCALTIME()</literal>,
+ <literal>LOCALTIMESTAMP</literal>, or
+ <literal>LOCALTIMESTAMP()</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
Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml 2006-04-19 21:48:22 UTC (rev 1878)
+++ trunk/refman-5.1/data-types.xml 2006-04-19 22:40:10 UTC (rev 1879)
@@ -3056,10 +3056,12 @@
<listitem>
<para>
- Any of <literal>CURRENT_TIMESTAMP</literal>,
- <literal>CURRENT_TIMESTAMP()</literal>,
- <literal>NOW()</literal>, <literal>LOCALTIME</literal>, or
- <literal>LOCALTIME()</literal> can be used in the
+ <literal>CURRENT_TIMESTAMP</literal> or any of its
+ synonyms (<literal>CURRENT_TIMESTAMP()</literal>,
+ <literal>NOW()</literal>, <literal>LOCALTIME</literal>,
+ <literal>LOCALTIME()</literal>,
+ <literal>LOCALTIMESTAMP</literal>, or
+ <literal>LOCALTIMESTAMP()</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
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1879 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 20 Apr |
