Author: paul
Date: 2008-06-25 03:18:18 +0200 (Wed, 25 Jun 2008)
New Revision: 11030
Log:
r32239@frost: paul | 2008-06-24 20:04:48 -0500
There were descriptions for {date,datetime,time}_format both in the system
variable and session variable sessions. Coalesce.
Modified:
trunk/refman-4.1/dba-core.xml
trunk/refman-5.0/dba-core.xml
trunk/refman-5.1/dba-core.xml
trunk/refman-6.0/dba-core.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:32238
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31778
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:32239
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31778
Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml 2008-06-25 01:18:06 UTC (rev 11029)
+++ trunk/refman-4.1/dba-core.xml 2008-06-25 01:18:18 UTC (rev 11030)
Changed blocks: 3, Lines Added: 34, Lines Deleted: 1; 2061 bytes
@@ -3442,8 +3442,19 @@
</para>
<para>
- This variable is not implemented.
+ This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts <literal>DATE</literal>
+ values to strings. This variable is available as a global,
+ local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
@@ -3454,6 +3465,17 @@
<para>
This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts
+ <literal>DATETIME</literal> values to strings. This variable
+ is available as a global, local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
@@ -6055,6 +6077,17 @@
<para>
This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts <literal>TIME</literal>
+ values to strings. This variable is available as a global,
+ local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml 2008-06-25 01:18:06 UTC (rev 11029)
+++ trunk/refman-5.0/dba-core.xml 2008-06-25 01:18:18 UTC (rev 11030)
Changed blocks: 5, Lines Added: 33, Lines Deleted: 60; 4421 bytes
@@ -4129,6 +4129,17 @@
<para>
This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts <literal>DATE</literal>
+ values to strings. This variable is available as a global,
+ local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
@@ -4139,6 +4150,17 @@
<para>
This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts
+ <literal>DATETIME</literal> values to strings. This variable
+ is available as a global, local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
@@ -7215,6 +7237,17 @@
<para>
This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts <literal>TIME</literal>
+ values to strings. This variable is available as a global,
+ local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
@@ -7762,47 +7795,7 @@
</note>
</listitem>
-<!--
<listitem>
- <remark>NOT YET IMPLEMENTED:</remark>
-
- <para>
- <literal>DATE_FORMAT =
- <replaceable>format_str</replaceable></literal>
- </para>
-
- <para>
- Determines how the server converts <literal>DATE</literal>
- values to strings. This variable is available as a global,
- local, or command-line option.
- <replaceable>format_str</replaceable> can be specified
- conveniently using the <function role="sql">GET_FORMAT()</function>
- function. See <xref linkend="date-and-time-functions"/>.
- </para>
- </listitem>
--->
-
-<!--
- <listitem>
- <remark>NOT YET IMPLEMENTED:</remark>
-
- <para>
- <literal>DATETIME_FORMAT =
- <replaceable>format_str</replaceable></literal>
- </para>
-
- <para>
- Determines how the server converts
- <literal>DATETIME</literal> values to strings. This variable
- is available as a global, local, or command-line option.
- <replaceable>format_str</replaceable> can be specified
- conveniently using the <function role="sql">GET_FORMAT()</function>
- function. See <xref linkend="date-and-time-functions"/>.
- </para>
- </listitem>
--->
-
- <listitem>
<para id="option_mysqld_foreign_key_checks">
<literal>FOREIGN_KEY_CHECKS = {0 | 1}</literal>
</para>
@@ -8143,27 +8136,7 @@
</para>
</listitem>
-<!--
<listitem>
- <remark>NOT YET IMPLEMENTED:</remark>
-
- <para>
- <literal>TIME_FORMAT =
- <replaceable>format_str</replaceable></literal>
- </para>
-
- <para>
- Determines how the server converts <literal>TIME</literal>
- values to strings. This variable is available as a global,
- local, or command-line option.
- <replaceable>format_str</replaceable> can be specified
- conveniently using the <function role="sql">GET_FORMAT()</function>
- function. See <xref linkend="date-and-time-functions"/>.
- </para>
- </listitem>
--->
-
- <listitem>
<para id="option_mysqld_unique_checks">
<literal>UNIQUE_CHECKS = {0 | 1}</literal>
</para>
Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml 2008-06-25 01:18:06 UTC (rev 11029)
+++ trunk/refman-5.1/dba-core.xml 2008-06-25 01:18:18 UTC (rev 11030)
Changed blocks: 5, Lines Added: 33, Lines Deleted: 62; 4565 bytes
@@ -4268,6 +4268,17 @@
<para>
This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts <literal>DATE</literal>
+ values to strings. This variable is available as a global,
+ local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
@@ -4275,11 +4286,20 @@
<literal>datetime_format</literal>
</para>
- <para condition="dynamic:optvar:item" role="5.1:mysqld:datetime_format"/>
-
<para>
This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts
+ <literal>DATETIME</literal> values to strings. This variable
+ is available as a global, local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
@@ -7718,6 +7738,17 @@
<para>
This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts <literal>TIME</literal>
+ values to strings. This variable is available as a global,
+ local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
@@ -8213,47 +8244,7 @@
</note>
</listitem>
-<!--
<listitem>
- <remark>NOT YET IMPLEMENTED:</remark>
-
- <para>
- <literal>DATE_FORMAT =
- <replaceable>format_str</replaceable></literal>
- </para>
-
- <para>
- Determines how the server converts <literal>DATE</literal>
- values to strings. This variable is available as a global,
- local, or command-line option.
- <replaceable>format_str</replaceable> can be specified
- conveniently using the <function role="sql">GET_FORMAT()</function>
- function. See <xref linkend="date-and-time-functions"/>.
- </para>
- </listitem>
--->
-
-<!--
- <listitem>
- <remark>NOT YET IMPLEMENTED:</remark>
-
- <para>
- <literal>DATETIME_FORMAT =
- <replaceable>format_str</replaceable></literal>
- </para>
-
- <para>
- Determines how the server converts
- <literal>DATETIME</literal> values to strings. This variable
- is available as a global, local, or command-line option.
- <replaceable>format_str</replaceable> can be specified
- conveniently using the <function role="sql">GET_FORMAT()</function>
- function. See <xref linkend="date-and-time-functions"/>.
- </para>
- </listitem>
--->
-
- <listitem>
<para id="option_mysqld_foreign_key_checks">
<literal>FOREIGN_KEY_CHECKS = {0 | 1}</literal>
</para>
@@ -8559,27 +8550,7 @@
</para>
</listitem>
-<!--
<listitem>
- <remark>NOT YET IMPLEMENTED:</remark>
-
- <para>
- <literal>TIME_FORMAT =
- <replaceable>format_str</replaceable></literal>
- </para>
-
- <para>
- Determines how the server converts <literal>TIME</literal>
- values to strings. This variable is available as a global,
- local, or command-line option.
- <replaceable>format_str</replaceable> can be specified
- conveniently using the <function role="sql">GET_FORMAT()</function>
- function. See <xref linkend="date-and-time-functions"/>.
- </para>
- </listitem>
--->
-
- <listitem>
<para id="option_mysqld_unique_checks">
<literal>UNIQUE_CHECKS = {0 | 1}</literal>
</para>
Modified: trunk/refman-6.0/dba-core.xml
===================================================================
--- trunk/refman-6.0/dba-core.xml 2008-06-25 01:18:06 UTC (rev 11029)
+++ trunk/refman-6.0/dba-core.xml 2008-06-25 01:18:18 UTC (rev 11030)
Changed blocks: 5, Lines Added: 33, Lines Deleted: 62; 4565 bytes
@@ -4204,6 +4204,17 @@
<para>
This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts <literal>DATE</literal>
+ values to strings. This variable is available as a global,
+ local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
@@ -4211,11 +4222,20 @@
<literal>datetime_format</literal>
</para>
- <para condition="dynamic:optvar:item" role="6.0:mysqld:datetime_format"/>
-
<para>
This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts
+ <literal>DATETIME</literal> values to strings. This variable
+ is available as a global, local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
@@ -7587,6 +7607,17 @@
<para>
This variable is unused.
</para>
+
+<!--
+ <para>
+ Determines how the server converts <literal>TIME</literal>
+ values to strings. This variable is available as a global,
+ local, or command-line option.
+ <replaceable>format_str</replaceable> can be specified
+ conveniently using the <function role="sql">GET_FORMAT()</function>
+ function. See <xref linkend="date-and-time-functions"/>.
+ </para>
+-->
</listitem>
<listitem>
@@ -8094,47 +8125,7 @@
</note>
</listitem>
-<!--
<listitem>
- <remark>NOT YET IMPLEMENTED:</remark>
-
- <para>
- <literal>DATE_FORMAT =
- <replaceable>format_str</replaceable></literal>
- </para>
-
- <para>
- Determines how the server converts <literal>DATE</literal>
- values to strings. This variable is available as a global,
- local, or command-line option.
- <replaceable>format_str</replaceable> can be specified
- conveniently using the <function role="sql">GET_FORMAT()</function>
- function. See <xref linkend="date-and-time-functions"/>.
- </para>
- </listitem>
--->
-
-<!--
- <listitem>
- <remark>NOT YET IMPLEMENTED:</remark>
-
- <para>
- <literal>DATETIME_FORMAT =
- <replaceable>format_str</replaceable></literal>
- </para>
-
- <para>
- Determines how the server converts
- <literal>DATETIME</literal> values to strings. This variable
- is available as a global, local, or command-line option.
- <replaceable>format_str</replaceable> can be specified
- conveniently using the <function role="sql">GET_FORMAT()</function>
- function. See <xref linkend="date-and-time-functions"/>.
- </para>
- </listitem>
--->
-
- <listitem>
<para id="option_mysqld_foreign_key_checks">
<literal>FOREIGN_KEY_CHECKS = {0 | 1}</literal>
</para>
@@ -8471,27 +8462,7 @@
</para>
</listitem>
-<!--
<listitem>
- <remark>NOT YET IMPLEMENTED:</remark>
-
- <para>
- <literal>TIME_FORMAT =
- <replaceable>format_str</replaceable></literal>
- </para>
-
- <para>
- Determines how the server converts <literal>TIME</literal>
- values to strings. This variable is available as a global,
- local, or command-line option.
- <replaceable>format_str</replaceable> can be specified
- conveniently using the <function role="sql">GET_FORMAT()</function>
- function. See <xref linkend="date-and-time-functions"/>.
- </para>
- </listitem>
--->
-
- <listitem>
<para id="option_mysqld_unique_checks">
<literal>UNIQUE_CHECKS = {0 | 1}</literal>
</para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11030 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 25 Jun |
