Author: paul
Date: 2006-01-14 19:03:54 +0100 (Sat, 14 Jan 2006)
New Revision: 828
Log:
r6201@frost: paul | 2006-01-14 11:03:06 -0600
Remove date-conversion information from charset chapter. Put it in
functions chapter instead. Also, be more specific that it's NO_ZERO_DATE
that controls the behavior, not just TRADITIONAL.
Modified:
trunk/
trunk/refman-4.1/functions.xml
trunk/refman-5.0/charset.xml
trunk/refman-5.0/functions.xml
trunk/refman-5.1/charset.xml
trunk/refman-5.1/functions.xml
trunk/refman-common/news-5.0.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6192
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2175
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6201
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2175
Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml 2006-01-14 11:38:19 UTC (rev 827)
+++ trunk/refman-4.1/functions.xml 2006-01-14 18:03:54 UTC (rev 828)
@@ -11079,9 +11079,10 @@
</itemizedlist>
<para>
- <literal>BINARY</literal> produces a binary string. See the
- entry for the <literal>BINARY</literal> operator in this
- section for a description of how this affects comparisons.
+ <literal>BINARY</literal> produces a string with the
+ <literal>BINARY</literal> data type. See
+ <xref linkend="binary-varbinary"/> for a description of how
+ this affects comparisons.
</para>
<para>
@@ -11103,8 +11104,8 @@
</para>
<para>
- <literal>CAST()</literal> and <literal>CONVERT(... USING
- ...)</literal> are standard SQL syntax. The
+ <literal>CAST()</literal> and <literal>CONVERT(… USING
+ …)</literal> are standard SQL syntax. The
non-<literal>USING</literal> form of
<literal>CONVERT()</literal> is ODBC syntax.
</para>
@@ -11130,8 +11131,8 @@
<para>
The cast functions are useful when you want to create a column
- with a specific type in a <literal>CREATE ... SELECT</literal>
- statement:
+ with a specific type in a <literal>CREATE …
+ SELECT</literal> statement:
</para>
<programlisting>
Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml 2006-01-14 11:38:19 UTC (rev 827)
+++ trunk/refman-5.0/charset.xml 2006-01-14 18:03:54 UTC (rev 828)
@@ -1803,13 +1803,6 @@
according to the standard SQL specification.
</para>
- <para>
- In <literal>TRADITIONAL</literal> SQL mode, if you convert a
- <quote>zero</quote> date string to a date,
- <literal>CONVERT()</literal> returns <literal>NULL</literal>.
- MySQL 5.0.4 and above also produce a warning.
- </para>
-
</section>
<section id="charset-cast">
@@ -1860,13 +1853,6 @@
SELECT CAST(_latin1'test' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin;
</programlisting>
- <para>
- In <literal>TRADITIONAL</literal> SQL mode, if you convert a
- <quote>zero</quote> date string to a date,
- <literal>CAST()</literal> returns <literal>NULL</literal>. MySQL
- 5.0.4 and above also produce a warning.
- </para>
-
</section>
<section id="charset-show">
Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml 2006-01-14 11:38:19 UTC (rev 827)
+++ trunk/refman-5.0/functions.xml 2006-01-14 18:03:54 UTC (rev 828)
@@ -11098,9 +11098,10 @@
</itemizedlist>
<para>
- <literal>BINARY</literal> produces a binary string. See the
- entry for the <literal>BINARY</literal> operator in this
- section for a description of how this affects comparisons.
+ <literal>BINARY</literal> produces a string with the
+ <literal>BINARY</literal> data type. See
+ <xref linkend="binary-varbinary"/> for a description of how
+ this affects comparisons.
</para>
<para>
@@ -11124,8 +11125,8 @@
</para>
<para>
- <literal>CAST()</literal> and <literal>CONVERT(... USING
- ...)</literal> are standard SQL syntax. The
+ <literal>CAST()</literal> and <literal>CONVERT(… USING
+ …)</literal> are standard SQL syntax. The
non-<literal>USING</literal> form of
<literal>CONVERT()</literal> is ODBC syntax.
</para>
@@ -11151,8 +11152,8 @@
<para>
The cast functions are useful when you want to create a column
- with a specific type in a <literal>CREATE ... SELECT</literal>
- statement:
+ with a specific type in a <literal>CREATE …
+ SELECT</literal> statement:
</para>
<programlisting>
@@ -11249,6 +11250,14 @@
converted to a floating-point number.
</para>
+ <para>
+ If you convert a <quote>zero</quote> date string to a date,
+ <literal>CONVERT()</literal> and <literal>CAST()</literal> return
+ <literal>NULL</literal> when the <literal>NO_ZERO_DATE</literal>
+ SQL mode is enabled. As of MySQL 5.0.4, they also produce a
+ warning.
+ </para>
+
</section>
<section id="other-functions">
Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml 2006-01-14 11:38:19 UTC (rev 827)
+++ trunk/refman-5.1/charset.xml 2006-01-14 18:03:54 UTC (rev 828)
@@ -1802,13 +1802,6 @@
according to the standard SQL specification.
</para>
- <para>
- In <literal>TRADITIONAL</literal> SQL mode, if you convert a
- <quote>zero</quote> date string to a date,
- <literal>CONVERT()</literal> returns <literal>NULL</literal>.
- MySQL ¤t-series; also produces a warning.
- </para>
-
</section>
<section id="charset-cast">
@@ -1859,13 +1852,6 @@
SELECT CAST(_latin1'test' AS CHAR CHARACTER SET utf8) COLLATE utf8_bin;
</programlisting>
- <para>
- In <literal>TRADITIONAL</literal> SQL mode, if you convert a
- <quote>zero</quote> date string to a date,
- <literal>CAST()</literal> returns <literal>NULL</literal>. MySQL
- ¤t-series; also produces a warning.
- </para>
-
</section>
<section id="charset-show">
Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml 2006-01-14 11:38:19 UTC (rev 827)
+++ trunk/refman-5.1/functions.xml 2006-01-14 18:03:54 UTC (rev 828)
@@ -11038,9 +11038,10 @@
</itemizedlist>
<para>
- <literal>BINARY</literal> produces a binary string. See the
- entry for the <literal>BINARY</literal> operator in this
- section for a description of how this affects comparisons.
+ <literal>BINARY</literal> produces a string with the
+ <literal>BINARY</literal> data type. See
+ <xref linkend="binary-varbinary"/> for a description of how
+ this affects comparisons.
</para>
<para>
@@ -11059,8 +11060,8 @@
</para>
<para>
- <literal>CAST()</literal> and <literal>CONVERT(... USING
- ...)</literal> are standard SQL syntax. The
+ <literal>CAST()</literal> and <literal>CONVERT(… USING
+ …)</literal> are standard SQL syntax. The
non-<literal>USING</literal> form of
<literal>CONVERT()</literal> is ODBC syntax.
</para>
@@ -11086,8 +11087,8 @@
<para>
The cast functions are useful when you want to create a column
- with a specific type in a <literal>CREATE ... SELECT</literal>
- statement:
+ with a specific type in a <literal>CREATE …
+ SELECT</literal> statement:
</para>
<programlisting>
@@ -11184,6 +11185,13 @@
converted to a floating-point number.
</para>
+ <para>
+ If you convert a <quote>zero</quote> date string to a date,
+ <literal>CONVERT()</literal> and <literal>CAST()</literal> return
+ <literal>NULL</literal> when the <literal>NO_ZERO_DATE</literal>
+ SQL mode is enabled. They also produce a warning.
+ </para>
+
</section>
<section id="xml-functions">
@@ -11227,21 +11235,24 @@
tag, nor any of their content (see the result returned as
<literal>val1</literal> below for an example).
</para>
-
+
<para>
If no match for <replaceable>xpath_expr</replaceable> is
found, this function returns an empty string.
+
<remark role="todo">
[js] Verify what the expected behaviour is before
uncommenting:
</remark>
- <!-- An empty string
+
+<!-- An empty string
is also returned if <replaceable>xml_frag</replaceable> is not
valid XML. If <replaceable>xpath_expr</replaceable> is not a
- valid XPath expression, then MySQL returns an error. --> If
- multiple matches are found, then the contents of all matching
- elements are returned (in the order matched) as a single,
- space-delimited string.
+ valid XPath expression, then MySQL returns an error. -->
+
+ If multiple matches are found, then the contents of all
+ matching elements are returned (in the order matched) as a
+ single, space-delimited string.
</para>
<remark role="help-description-end"/>
@@ -11296,7 +11307,7 @@
<replaceable>xml_target</replaceable> XML fragment. All three
arguments must be strings.
</para>
-
+
<remark role="todo">
[js] Determine the expected behaviour in the event of multiple
matches and document here.
@@ -11446,13 +11457,13 @@
For example, the expression <literal>//b[@id="idB"]</literal>
matches the second <replaceable>b</replaceable> element in the
fragment <literal><a><b id="idA"/><c/><b
- id="idB"/></a></literal>. To match against
+ id="idB"/></a></literal>. To match against
<emphasis>any</emphasis> element having
<literal><replaceable>attribute</replaceable>="<replaceable>value</replaceable>"</literal>,
use the XPath expression
<literal>//*[<replaceable>attribute</replaceable>="<replaceable>value</replaceable>"]</literal>.
</para>
-
+
<para>
To filter multiple attribute values, simply use multiple
attribute-comparison clauses in succession. For example, the
Modified: trunk/refman-common/news-5.0.xml
===================================================================
--- trunk/refman-common/news-5.0.xml 2006-01-14 11:38:19 UTC (rev 827)
+++ trunk/refman-common/news-5.0.xml 2006-01-14 18:03:54 UTC (rev 828)
@@ -8737,8 +8737,8 @@
<listitem>
<para>
Using <literal>CONVERT('0000-00-00',date)</literal> or
- <literal>CAST('0000-00-00' as date)</literal> in
- <literal>TRADITIONAL</literal> SQL mode now produces a
+ <literal>CAST('0000-00-00' as date)</literal> with the
+ <literal>NO_ZERO_DATE</literal> SQL mode enabled now produces a
warning. (Bug #6145)
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r828 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 14 Jan |
