Author: paul
Date: 2006-01-20 20:36:05 +0100 (Fri, 20 Jan 2006)
New Revision: 954
Log:
r6488@frost: paul | 2006-01-20 13:33:46 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/functions.xml
trunk/refman-4.1/problems.xml
trunk/refman-5.0/functions.xml
trunk/refman-5.0/problems.xml
trunk/refman-5.1/extending-mysql.xml
trunk/refman-5.1/functions.xml
trunk/refman-5.1/problems.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6487
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2387
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6488
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2387
Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml 2006-01-20 19:35:49 UTC (rev 953)
+++ trunk/refman-4.1/functions.xml 2006-01-20 19:36:05 UTC (rev 954)
@@ -12697,7 +12697,10 @@
<para>
Returns the default (current) database name. As of MySQL
4.1, the string uses the <literal>utf8</literal> character
- set.
+ set. If there is no default database,
+ <literal>DATABASE()</literal> returns
+ <literal>NULL</literal> as of MySQL 4.1.1, and the empty
+ string before that.
</para>
<remark role="help-description-end"/>
@@ -12708,13 +12711,6 @@
mysql> <userinput>SELECT DATABASE();</userinput>
-> 'test'
</programlisting>
-
- <para>
- If there is no default database,
- <literal>DATABASE()</literal> returns
- <literal>NULL</literal> as of MySQL 4.1.1, and the empty
- string before that.
- </para>
</listitem>
<listitem>
Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml 2006-01-20 19:35:49 UTC (rev 953)
+++ trunk/refman-4.1/problems.xml 2006-01-20 19:36:05 UTC (rev 954)
@@ -3298,7 +3298,7 @@
<para>
If you have a problem with <literal>SELECT NOW()</literal>
- returning values in GMT and not your local time, you have to
+ returning values in UTC and not your local time, you have to
tell the server your current time zone. The same applies if
<literal>UNIX_TIMESTAMP()</literal> returns the wrong value.
This should be done for the environment in which the server
Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml 2006-01-20 19:35:49 UTC (rev 953)
+++ trunk/refman-5.0/functions.xml 2006-01-20 19:36:05 UTC (rev 954)
@@ -8068,11 +8068,9 @@
<para>
Range checking on the parts of date values is as described in
- <xref linkend="datetime"/>. This means, for example, that a
- date with a day part larger than the number of days in a month
- is allowable as long as the day part is in the range from 1 to
- 31. Also, <quote>zero</quote> dates or dates with part values
- of 0 are allowed.
+ <xref linkend="datetime"/>. This means, for example, that
+ <quote>zero</quote> dates or dates with part values of 0 are
+ allowed unless the SQL mode is set to disallow such values.
</para>
<programlisting>
@@ -11708,9 +11706,9 @@
If you want to store results from an encryption function that
might contain arbitrary byte values, use a
<literal>BLOB</literal> column rather than a
- <literal>CHAR</literal> or <literal>VARCHAR</literal> column to
- avoid potential problems with trailing space removal that would
- change data values.
+ <literal>CHAR</literal> or (before MySQL 5.0.3)
+ <literal>VARCHAR</literal> column to avoid potential problems
+ with trailing space removal that would change data values.
</para>
<itemizedlist>
@@ -12670,12 +12668,13 @@
<remark role="help-description-begin"/>
<para>
- Returns the default (current) database name using the
- <literal>utf8</literal> character set. Within a stored
- routine, the default database is the database that the
- routine is associated with, which is not necessarily the
- same as the database that is the default in the calling
- context.
+ Returns the default (current) database name as a string in
+ the <literal>utf8</literal> character set. If there is no
+ default database, <literal>DATABASE()</literal> returns
+ <literal>NULL</literal>. Within a stored routine, the
+ default database is the database that the routine is
+ associated with, which is not necessarily the same as the
+ database that is the default in the calling context.
</para>
<remark role="help-description-end"/>
@@ -12686,12 +12685,6 @@
mysql> <userinput>SELECT DATABASE();</userinput>
-> 'test'
</programlisting>
-
- <para>
- If there is no default database,
- <literal>DATABASE()</literal> returns
- <literal>NULL</literal>.
- </para>
</listitem>
<listitem>
@@ -13231,18 +13224,6 @@
mysql> <userinput>SELECT SUBSTRING_INDEX(USER(),'@',1);</userinput>
-> 'davida'
</programlisting>
-
- <para>
- Because <literal>USER()</literal> returns a value in the
- <literal>utf8</literal> character set, you should also make
- sure that the <literal>'@'</literal> string literal is
- interpreted in that character set:
- </para>
-
-<programlisting>
-mysql> <userinput>SELECT SUBSTRING_INDEX(USER(),_utf8'@',1);</userinput>
- -> 'davida'
-</programlisting>
</listitem>
<listitem>
Modified: trunk/refman-5.0/problems.xml
===================================================================
--- trunk/refman-5.0/problems.xml 2006-01-20 19:35:49 UTC (rev 953)
+++ trunk/refman-5.0/problems.xml 2006-01-20 19:36:05 UTC (rev 954)
@@ -3265,7 +3265,7 @@
<para>
If you have a problem with <literal>SELECT NOW()</literal>
- returning values in GMT and not your local time, you have to
+ returning values in UTC and not your local time, you have to
tell the server your current time zone. The same applies if
<literal>UNIX_TIMESTAMP()</literal> returns the wrong value.
This should be done for the environment in which the server
Modified: trunk/refman-5.1/extending-mysql.xml
===================================================================
--- trunk/refman-5.1/extending-mysql.xml 2006-01-20 19:35:49 UTC (rev 953)
+++ trunk/refman-5.1/extending-mysql.xml 2006-01-20 19:36:05 UTC (rev 954)
@@ -1084,7 +1084,9 @@
<para>
This section describes the general and type-specific parts of
the plugin API. It also provides a step-by-step guide to
- creating a plugin library.
+ creating a plugin library. For example plugin source code, see
+ the <filename>plugin/fulltext</filename> directory of a MySQL
+ source distribution.
</para>
<para>
Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml 2006-01-20 19:35:49 UTC (rev 953)
+++ trunk/refman-5.1/functions.xml 2006-01-20 19:36:05 UTC (rev 954)
@@ -8022,11 +8022,9 @@
<para>
Range checking on the parts of date values is as described in
- <xref linkend="datetime"/>. This means, for example, that a
- date with a day part larger than the number of days in a month
- is allowable as long as the day part is in the range from 1 to
- 31. Also, <quote>zero</quote> dates or dates with part values
- of 0 are allowed.
+ <xref linkend="datetime"/>. This means, for example, that
+ <quote>zero</quote> dates or dates with part values of 0 are
+ allowed unless the SQL mode is set to disallow such values.
</para>
<programlisting>
@@ -9400,6 +9398,14 @@
</para>
<para>
+ In MySQL ¤t-series;, it is possible to write a plugin that
+ replaces the built-in full-text parser. For details, see
+ <xref linkend="plugin-api"/>. For example parser plugin source
+ code, see the <filename>plugin/fulltext</filename> directory of a
+ MySQL source distribution.
+ </para>
+
+ <para>
Some words are ignored in full-text searches:
</para>
@@ -11318,8 +11324,8 @@
<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.
+ <literal>NULL</literal> and produce a warning when the
+ <literal>NO_ZERO_DATE</literal> SQL mode is enabled.
</para>
</section>
@@ -13050,12 +13056,13 @@
<remark role="help-description-begin"/>
<para>
- Returns the default (current) database name using the
- <literal>utf8</literal> character set. Within a stored
- routine, the default database is the database that the
- routine is associated with, which is not necessarily the
- same as the database that is the default in the calling
- context.
+ Returns the default (current) database name as a string in
+ the <literal>utf8</literal> character set. If there is no
+ default database, <literal>DATABASE()</literal> returns
+ <literal>NULL</literal>. Within a stored routine, the
+ default database is the database that the routine is
+ associated with, which is not necessarily the same as the
+ database that is the default in the calling context.
</para>
<remark role="help-description-end"/>
@@ -13607,18 +13614,6 @@
mysql> <userinput>SELECT SUBSTRING_INDEX(USER(),'@',1);</userinput>
-> 'davida'
</programlisting>
-
- <para>
- Because <literal>USER()</literal> returns a value in the
- <literal>utf8</literal> character set, you should also make
- sure that the <literal>'@'</literal> string literal is
- interpreted in that character set:
- </para>
-
-<programlisting>
-mysql> <userinput>SELECT SUBSTRING_INDEX(USER(),_utf8'@',1);</userinput>
- -> 'davida'
-</programlisting>
</listitem>
<listitem>
Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml 2006-01-20 19:35:49 UTC (rev 953)
+++ trunk/refman-5.1/problems.xml 2006-01-20 19:36:05 UTC (rev 954)
@@ -3265,7 +3265,7 @@
<para>
If you have a problem with <literal>SELECT NOW()</literal>
- returning values in GMT and not your local time, you have to
+ returning values in UTC and not your local time, you have to
tell the server your current time zone. The same applies if
<literal>UNIX_TIMESTAMP()</literal> returns the wrong value.
This should be done for the environment in which the server
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r954 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 20 Jan |
