Author: paul
Date: 2006-03-25 02:06:17 +0100 (Sat, 25 Mar 2006)
New Revision: 1668
Log:
r8950@frost: paul | 2006-03-24 19:03:52 -0600
Fold in proof corrections.
Modified:
trunk/
trunk/refman-4.1/functions.xml
trunk/refman-5.0/functions.xml
trunk/refman-5.1/functions.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8925
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4118
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8950
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4118
Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml 2006-03-24 20:13:30 UTC (rev 1667)
+++ trunk/refman-4.1/functions.xml 2006-03-25 01:06:17 UTC (rev 1668)
@@ -2488,7 +2488,7 @@
<replaceable>N</replaceable>, where
<replaceable>N</replaceable> is a longlong
(<literal>BIGINT</literal>) number. This is equivalent to
- <literal>CONV(N,10,16)</literal>.
+ <literal>CONV(<replaceable>N</replaceable>,10,16)</literal>.
</para>
<para>
@@ -6559,7 +6559,7 @@
<para>
Date arithmetic operations require complete dates and do not
work with incomplete dates such as
- <literal>'2005-07-00'</literal> or badly malformed dates:
+ <literal>'2006-07-00'</literal> or badly malformed dates:
</para>
<programlisting>
@@ -9286,7 +9286,7 @@
The MySQL <literal>FULLTEXT</literal> implementation regards any
sequence of true word characters (letters, digits, and
underscores) as a word. That sequence may also contain apostrophes
- (<literal>'</literal>), but not more than one in a row. This means
+ (‘<literal>'</literal>’), but not more than one in a row. This means
that <literal>aaa'bbb</literal> is regarded as one word, but
<literal>aaa''bbb</literal> is regarded as two words. Apostrophes
at the beginning or the end of a word are stripped by the
@@ -10751,8 +10751,8 @@
The stopword list is free-form. That is, you may use any
non-alphanumeric character such as newline, space, or comma
to separate stopwords. Exceptions are the underscore
- character (<literal>_</literal>) and a single apostrophe
- (<literal>'</literal>) which are treated as part of a word.
+ character (‘<literal>_</literal>’) and a single apostrophe
+ (‘<literal>'</literal>’) which are treated as part of a word.
The character set of the stopword list is the server's
default character set; see <xref linkend="charset-server"/>.
</para>
@@ -11085,7 +11085,7 @@
<xref linkend="binary-varbinary"/> for a description of how
this affects comparisons. If the optional length
<replaceable>N</replaceable> is given,
- <literal>BINARY[<replaceable>N</replaceable>]</literal> causes
+ <literal>BINARY(<replaceable>N</replaceable>)</literal> causes
the cast to use no more than <replaceable>N</replaceable>
bytes of the argument. Similarly,
<literal>CHAR[<replaceable>N</replaceable>]</literal> causes
@@ -11961,7 +11961,7 @@
<primary>DES_ENCRYPT()</primary>
</indexterm>
- <literal>DES_ENCRYPT(<replaceable>str</replaceable>[,(<replaceable>key_num</replaceable>|<replaceable>key_str</replaceable>)])</literal>
+ <literal>DES_ENCRYPT(<replaceable>str</replaceable>[,{<replaceable>key_num</replaceable>|<replaceable>key_str</replaceable>}])</literal>
</para>
<remark role="help-syntax-end"/>
@@ -12019,7 +12019,7 @@
<para>
The return string is a binary string where the first
- character is <literal>CHAR(128 | key_num)</literal>. If an
+ character is <literal>CHAR(128 | <replaceable>key_num</replaceable>)</literal>. If an
error occurs, <literal>DES_ENCRYPT()</literal> returns
<literal>NULL</literal>.
</para>
@@ -12056,7 +12056,7 @@
used to encrypt the message. There should be at least one
space between the number and the key. The first key is the
default key that is used if you do not specify any key
- argument to <literal>DES_ENCRYPT()</literal>
+ argument to <literal>DES_ENCRYPT()</literal>.
</para>
<para>
@@ -13572,7 +13572,7 @@
</programlisting>
<para>
- <emphasis role="bold">NOTE</emphasis>: When storing values
+ <emphasis role="bold">Note</emphasis>: When storing values
generated by <literal>INET_ATON()</literal>, it is
recommended that you use an <literal>INT UNSIGNED</literal>
column. If you use a (signed) <literal>INT</literal> column,
@@ -14148,7 +14148,6 @@
-> <userinput>FROM student,course</userinput>
-> <userinput>WHERE student.student_id=course.student_id</userinput>
-> <userinput>GROUP BY student_name;</userinput>
-
</programlisting>
<para>
Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml 2006-03-24 20:13:30 UTC (rev 1667)
+++ trunk/refman-5.0/functions.xml 2006-03-25 01:06:17 UTC (rev 1668)
@@ -2581,7 +2581,7 @@
<replaceable>N</replaceable>, where
<replaceable>N</replaceable> is a longlong
(<literal>BIGINT</literal>) number. This is equivalent to
- <literal>CONV(N,10,16)</literal>.
+ <literal>CONV(<replaceable>N</replaceable>,10,16)</literal>.
</para>
<para>
@@ -5535,9 +5535,9 @@
<replaceable>j</replaceable>, use the expression
<literal>FLOOR(<replaceable>i</replaceable> + RAND() *
(<replaceable>j</replaceable> −
- <replaceable>i</replaceable>)</literal>. For
- example, to obtain a random integer in the range of 7 to 12
- inclusive, you could use the following statement:
+ <replaceable>i</replaceable>)</literal>. For example, to
+ obtain a random integer in the range of 7 to 12 inclusive,
+ you could use the following statement:
</para>
<programlisting>
@@ -6654,7 +6654,7 @@
<para>
Date arithmetic operations require complete dates and do not
work with incomplete dates such as
- <literal>'2005-07-00'</literal> or badly malformed dates:
+ <literal>'2006-07-00'</literal> or badly malformed dates:
</para>
<programlisting>
@@ -9394,12 +9394,13 @@
The MySQL <literal>FULLTEXT</literal> implementation regards any
sequence of true word characters (letters, digits, and
underscores) as a word. That sequence may also contain apostrophes
- (<literal>'</literal>), but not more than one in a row. This means
- that <literal>aaa'bbb</literal> is regarded as one word, but
- <literal>aaa''bbb</literal> is regarded as two words. Apostrophes
- at the beginning or the end of a word are stripped by the
- <literal>FULLTEXT</literal> parser; <literal>'aaa'bbb'</literal>
- would be parsed as <literal>aaa'bbb</literal>.
+ (‘<literal>'</literal>’), but not more than one in a
+ row. This means that <literal>aaa'bbb</literal> is regarded as one
+ word, but <literal>aaa''bbb</literal> is regarded as two words.
+ Apostrophes at the beginning or the end of a word are stripped by
+ the <literal>FULLTEXT</literal> parser;
+ <literal>'aaa'bbb'</literal> would be parsed as
+ <literal>aaa'bbb</literal>.
</para>
<para>
@@ -10861,10 +10862,11 @@
The stopword list is free-form. That is, you may use any
non-alphanumeric character such as newline, space, or comma
to separate stopwords. Exceptions are the underscore
- character (<literal>_</literal>) and a single apostrophe
- (<literal>'</literal>) which are treated as part of a word.
- The character set of the stopword list is the server's
- default character set; see <xref linkend="charset-server"/>.
+ character (‘<literal>_</literal>’) and a single
+ apostrophe (‘<literal>'</literal>’) which are
+ treated as part of a word. The character set of the stopword
+ list is the server's default character set; see
+ <xref linkend="charset-server"/>.
</para>
</listitem>
@@ -11174,7 +11176,7 @@
<xref linkend="binary-varbinary"/> for a description of how
this affects comparisons. If the optional length
<replaceable>N</replaceable> is given,
- <literal>BINARY[<replaceable>N</replaceable>]</literal> causes
+ <literal>BINARY(<replaceable>N</replaceable>)</literal> causes
the cast to use no more than <replaceable>N</replaceable>
bytes of the argument. As of MySQL 5.0.17, values shorter than
<replaceable>N</replaceable> bytes are padded with
@@ -11183,7 +11185,7 @@
</para>
<para>
- <literal>CHAR[<replaceable>N</replaceable>]</literal> causes
+ <literal>CHAR(<replaceable>N</replaceable>)</literal> causes
the cast to use no more than <replaceable>N</replaceable>
characters of the argument.
</para>
@@ -11975,7 +11977,7 @@
<primary>DES_ENCRYPT()</primary>
</indexterm>
- <literal>DES_ENCRYPT(<replaceable>str</replaceable>[,(<replaceable>key_num</replaceable>|<replaceable>key_str</replaceable>)])</literal>
+ <literal>DES_ENCRYPT(<replaceable>str</replaceable>[,{<replaceable>key_num</replaceable>|<replaceable>key_str</replaceable>}])</literal>
</para>
<remark role="help-syntax-end"/>
@@ -12033,8 +12035,9 @@
<para>
The return string is a binary string where the first
- character is <literal>CHAR(128 | key_num)</literal>. If an
- error occurs, <literal>DES_ENCRYPT()</literal> returns
+ character is <literal>CHAR(128 |
+ <replaceable>key_num</replaceable>)</literal>. If an error
+ occurs, <literal>DES_ENCRYPT()</literal> returns
<literal>NULL</literal>.
</para>
@@ -12070,7 +12073,7 @@
used to encrypt the message. There should be at least one
space between the number and the key. The first key is the
default key that is used if you do not specify any key
- argument to <literal>DES_ENCRYPT()</literal>
+ argument to <literal>DES_ENCRYPT()</literal>.
</para>
<para>
@@ -13609,7 +13612,7 @@
</programlisting>
<para>
- <emphasis role="bold">NOTE</emphasis>: When storing values
+ <emphasis role="bold">Note</emphasis>: When storing values
generated by <literal>INET_ATON()</literal>, it is
recommended that you use an <literal>INT UNSIGNED</literal>
column. If you use a (signed) <literal>INT</literal> column,
@@ -14243,7 +14246,6 @@
-> <userinput>FROM student,course</userinput>
-> <userinput>WHERE student.student_id=course.student_id</userinput>
-> <userinput>GROUP BY student_name;</userinput>
-
</programlisting>
<para>
@@ -14422,7 +14424,7 @@
If a maximum length has been set, the result is truncated to
this maximum length.
</para>
-
+
<para>
Beginning with MySQL 5.0.19, the type returned by
<literal>GROUP_CONCAT()</literal> is always
Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml 2006-03-24 20:13:30 UTC (rev 1667)
+++ trunk/refman-5.1/functions.xml 2006-03-25 01:06:17 UTC (rev 1668)
@@ -2553,7 +2553,7 @@
<replaceable>N</replaceable>, where
<replaceable>N</replaceable> is a longlong
(<literal>BIGINT</literal>) number. This is equivalent to
- <literal>CONV(N,10,16)</literal>.
+ <literal>CONV(<replaceable>N</replaceable>,10,16)</literal>.
</para>
<para>
@@ -5507,9 +5507,9 @@
<replaceable>j</replaceable>, use the expression
<literal>FLOOR(<replaceable>i</replaceable> + RAND() *
(<replaceable>j</replaceable> −
- <replaceable>i</replaceable>)</literal>. For
- example, to obtain a random integer in the range of 7 to 12
- inclusive, you could use the following statement:
+ <replaceable>i</replaceable>)</literal>. For example, to
+ obtain a random integer in the range of 7 to 12 inclusive,
+ you could use the following statement:
</para>
<programlisting>
@@ -6608,7 +6608,7 @@
<para>
Date arithmetic operations require complete dates and do not
work with incomplete dates such as
- <literal>'2005-07-00'</literal> or badly malformed dates:
+ <literal>'2006-07-00'</literal> or badly malformed dates:
</para>
<programlisting>
@@ -9357,12 +9357,13 @@
The MySQL <literal>FULLTEXT</literal> implementation regards any
sequence of true word characters (letters, digits, and
underscores) as a word. That sequence may also contain apostrophes
- (<literal>'</literal>), but not more than one in a row. This means
- that <literal>aaa'bbb</literal> is regarded as one word, but
- <literal>aaa''bbb</literal> is regarded as two words. Apostrophes
- at the beginning or the end of a word are stripped by the
- <literal>FULLTEXT</literal> parser; <literal>'aaa'bbb'</literal>
- would be parsed as <literal>aaa'bbb</literal>.
+ (‘<literal>'</literal>’), but not more than one in a
+ row. This means that <literal>aaa'bbb</literal> is regarded as one
+ word, but <literal>aaa''bbb</literal> is regarded as two words.
+ Apostrophes at the beginning or the end of a word are stripped by
+ the <literal>FULLTEXT</literal> parser;
+ <literal>'aaa'bbb'</literal> would be parsed as
+ <literal>aaa'bbb</literal>.
</para>
<para>
@@ -10831,10 +10832,11 @@
The stopword list is free-form. That is, you may use any
non-alphanumeric character such as newline, space, or comma
to separate stopwords. Exceptions are the underscore
- character (<literal>_</literal>) and a single apostrophe
- (<literal>'</literal>) which are treated as part of a word.
- The character set of the stopword list is the server's
- default character set; see <xref linkend="charset-server"/>.
+ character (‘<literal>_</literal>’) and a single
+ apostrophe (‘<literal>'</literal>’) which are
+ treated as part of a word. The character set of the stopword
+ list is the server's default character set; see
+ <xref linkend="charset-server"/>.
</para>
</listitem>
@@ -11144,7 +11146,7 @@
<xref linkend="binary-varbinary"/> for a description of how
this affects comparisons. If the optional length
<replaceable>N</replaceable> is given,
- <literal>BINARY[<replaceable>N</replaceable>]</literal> causes
+ <literal>BINARY(<replaceable>N</replaceable>)</literal> causes
the cast to use no more than <replaceable>N</replaceable>
bytes of the argument. Values shorter than
<replaceable>N</replaceable> bytes are padded with
@@ -11153,7 +11155,7 @@
</para>
<para>
- <literal>CHAR[<replaceable>N</replaceable>]</literal> causes
+ <literal>CHAR(<replaceable>N</replaceable>)</literal> causes
the cast to use no more than <replaceable>N</replaceable>
characters of the argument.
</para>
@@ -11394,7 +11396,7 @@
uncommenting:
</remark>
- <!--
+<!--
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
@@ -11424,12 +11426,12 @@
| ccc | ddd | ddd | | ddd eee |
+------+------+------+------+---------+
</programlisting>
-
+
<para>
Beginning with MySQL 5.1.8, this function uses the current SQL
collation for making comparisons with
- <literal>contains()</literal>. (Previously, binary — that
- is, case-sensitive — comparison was always used.)
+ <literal>contains()</literal>. (Previously, binary —
+ that is, case-sensitive — comparison was always used.)
</para>
</listitem>
@@ -11696,12 +11698,12 @@
The <literal>::</literal> operator is not supported.
</para>
</listitem>
-
+
<listitem>
<para>
- <quote>Up-and-down</quote> navigation is not supported. That is, you
- cannot use expressions which match on descendants of ancestors of a
- given element. (Bug #16321)
+ <quote>Up-and-down</quote> navigation is not supported. That
+ is, you cannot use expressions which match on descendants of
+ ancestors of a given element. (Bug #16321)
</para>
</listitem>
@@ -12441,7 +12443,7 @@
<primary>DES_ENCRYPT()</primary>
</indexterm>
- <literal>DES_ENCRYPT(<replaceable>str</replaceable>[,(<replaceable>key_num</replaceable>|<replaceable>key_str</replaceable>)])</literal>
+ <literal>DES_ENCRYPT(<replaceable>str</replaceable>[,{<replaceable>key_num</replaceable>|<replaceable>key_str</replaceable>}])</literal>
</para>
<remark role="help-syntax-end"/>
@@ -12499,8 +12501,9 @@
<para>
The return string is a binary string where the first
- character is <literal>CHAR(128 | key_num)</literal>. If an
- error occurs, <literal>DES_ENCRYPT()</literal> returns
+ character is <literal>CHAR(128 |
+ <replaceable>key_num</replaceable>)</literal>. If an error
+ occurs, <literal>DES_ENCRYPT()</literal> returns
<literal>NULL</literal>.
</para>
@@ -12536,7 +12539,7 @@
used to encrypt the message. There should be at least one
space between the number and the key. The first key is the
default key that is used if you do not specify any key
- argument to <literal>DES_ENCRYPT()</literal>
+ argument to <literal>DES_ENCRYPT()</literal>.
</para>
<para>
@@ -14035,7 +14038,7 @@
</programlisting>
<para>
- <emphasis role="bold">NOTE</emphasis>: When storing values
+ <emphasis role="bold">Note</emphasis>: When storing values
generated by <literal>INET_ATON()</literal>, it is
recommended that you use an <literal>INT UNSIGNED</literal>
column. If you use a (signed) <literal>INT</literal> column,
@@ -14669,7 +14672,6 @@
-> <userinput>FROM student,course</userinput>
-> <userinput>WHERE student.student_id=course.student_id</userinput>
-> <userinput>GROUP BY student_name;</userinput>
-
</programlisting>
<para>
@@ -14848,7 +14850,7 @@
If a maximum length has been set, the result is truncated to
this maximum length.
</para>
-
+
<para>
The type returned by <literal>GROUP_CONCAT()</literal> is
always <literal>VARCHAR</literal> unless
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1668 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 25 Mar |
