Author: paul
Date: 2006-01-22 21:08:26 +0100 (Sun, 22 Jan 2006)
New Revision: 990
Log:
r6562@frost: paul | 2006-01-22 13:26:32 -0600
General revisions.
Modified:
trunk/
trunk/refman-4.1/functions.xml
trunk/refman-4.1/installing.xml
trunk/refman-5.0/charset.xml
trunk/refman-5.0/functions.xml
trunk/refman-5.0/installing.xml
trunk/refman-5.1/charset.xml
trunk/refman-5.1/functions.xml
trunk/refman-5.1/installing.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6561
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6562
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2396
Modified: trunk/refman-4.1/functions.xml
===================================================================
--- trunk/refman-4.1/functions.xml 2006-01-22 20:08:12 UTC (rev 989)
+++ trunk/refman-4.1/functions.xml 2006-01-22 20:08:26 UTC (rev 990)
@@ -12504,7 +12504,8 @@
</programlisting>
<para>
- The return values have the following meanings:
+ The return values have the meanings shown in the following
+ table. Lower values have higher precedence.
</para>
<informaltable>
@@ -12554,9 +12555,9 @@
</informaltable>
<para>
- Before MySQL 4.1.11, the return values are shown as follows,
- and functions such as <literal>USER()</literal> have a
- coercibility of 2:
+ Before MySQL 4.1.11, the return values are shown in
+ following table, and functions such as
+ <literal>USER()</literal> have a coercibility of 2.
</para>
<informaltable>
@@ -12595,10 +12596,6 @@
</informaltable>
<para>
- Lower values have higher precedence.
- </para>
-
- <para>
<literal>COERCIBILITY()</literal> was added in MySQL 4.1.1.
</para>
</listitem>
@@ -12621,8 +12618,7 @@
<remark role="help-description-begin"/>
<para>
- Returns the collation for the character set of the string
- argument.
+ Returns the collation of the string argument.
</para>
<remark role="help-description-end"/>
@@ -12660,7 +12656,8 @@
<para>
Returns the connection ID (thread ID) for the connection.
- Every connection has its own unique ID.
+ Every connection has an ID that is unique among the set of
+ currently connected clients.
</para>
<remark role="help-description-end"/>
@@ -12697,9 +12694,9 @@
<remark role="help-description-begin"/>
<para>
- Returns the username and hostname combination that the
- current session was authenticated as. This value corresponds
- to the MySQL account that determines your access privileges.
+ Returns the username and hostname combination for the MySQL
+ account that the server used to authenticate the current
+ client. This account determines your access privileges.
</para>
<para>
@@ -12802,9 +12799,9 @@
rows the server returns to the client. In some cases, it is
desirable to know how many rows the statement would have
returned without the <literal>LIMIT</literal>, but without
- running the statement again. To get this row count, include
- a <literal>SQL_CALC_FOUND_ROWS</literal> option in the
- <literal>SELECT</literal> statement, then invoke
+ running the statement again. To obtain this row count,
+ include a <literal>SQL_CALC_FOUND_ROWS</literal> option in
+ the <literal>SELECT</literal> statement, and then invoke
<literal>FOUND_ROWS()</literal> afterward:
</para>
Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml 2006-01-22 20:08:12 UTC (rev 989)
+++ trunk/refman-4.1/installing.xml 2006-01-22 20:08:26 UTC (rev 990)
@@ -13604,8 +13604,10 @@
your grant tables are current when you update to a new version
of MySQL, you should run the
<command>mysql_fix_privilege_tables</command> script to update
- your grant tables as well. The procedure for doing this is
- described at <xref linkend="mysql-fix-privilege-tables"/>.
+ your grant tables as well. Otherwise, there might be
+ capabilities that you cannot take advantage of. The procedure
+ for performing the update is described at
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
</section>
Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml 2006-01-22 20:08:12 UTC (rev 989)
+++ trunk/refman-5.0/charset.xml 2006-01-22 20:08:26 UTC (rev 990)
@@ -898,8 +898,8 @@
<title>&title-charset-national;</title>
<para>
- Standard SQL defines <literal>NCHAR</literal> or <literal>NATIONAL
- CHAR</literal> as a way to indicate that a
+ Standard SQL defines <literal>NCHAR</literal> or
+ <literal>NATIONAL CHAR</literal> as a way to indicate that a
<literal>CHAR</literal> column should use some predefined
character set. MySQL ¤t-series; uses
<literal>utf8</literal> as this predefined character set. For
@@ -1540,7 +1540,8 @@
<listitem>
<para>
- A column's collation has a coercibility of 2.
+ The collation of a column or a stored routine parameter or
+ local variable has a coercibility of 2.
</para>
</listitem>
@@ -1735,7 +1736,8 @@
<para>
The character that causes the different sort orders in this
example is the U with two dots over it
- (<literal>ü</literal>), which the Germans call <quote>U-umlaut.</quote>
+ (<literal>ü</literal>), which the Germans call
+ <quote>U-umlaut.</quote>
</para>
<itemizedlist>
@@ -2122,12 +2124,12 @@
<para>
In UCS-2 (binary Unicode representation), every character is
represented by a two-byte Unicode code with the most significant
- byte first. For example: <literal>LATIN CAPITAL LETTER A</literal> has the code
- <literal>0x0041</literal> and it is stored as a two-byte sequence:
- <literal>0x00 0x41</literal>. <literal>CYRILLIC SMALL LETTER YERU</literal>
- (Unicode <literal>0x044B</literal>) is stored as a two-byte
- sequence: <literal>0x04 0x4B</literal>. For Unicode characters and
- their codes, please refer to the
+ byte first. For example: <literal>LATIN CAPITAL LETTER A</literal>
+ has the code <literal>0x0041</literal> and it is stored as a
+ two-byte sequence: <literal>0x00 0x41</literal>. <literal>CYRILLIC
+ SMALL LETTER YERU</literal> (Unicode <literal>0x044B</literal>) is
+ stored as a two-byte sequence: <literal>0x04 0x4B</literal>. For
+ Unicode characters and their codes, please refer to the
<ulink url="http://www.unicode.org/">Unicode Home Page</ulink>.
</para>
Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml 2006-01-22 20:08:12 UTC (rev 989)
+++ trunk/refman-5.0/functions.xml 2006-01-22 20:08:26 UTC (rev 990)
@@ -12486,7 +12486,8 @@
</programlisting>
<para>
- The return values have the following meanings:
+ The return values have the meanings shown in the following
+ table. Lower values have higher precedence.
</para>
<informaltable>
@@ -12565,7 +12566,7 @@
<row>
<entry><literal>2</literal></entry>
<entry>Implicit collation</entry>
- <entry>Column value</entry>
+ <entry>Column value, stored routine parameter or local variable</entry>
</row>
<row>
<entry><literal>3</literal></entry>
@@ -12575,10 +12576,6 @@
</tbody>
</tgroup>
</informaltable>
-
- <para>
- Lower values have higher precedence.
- </para>
</listitem>
<listitem>
@@ -12599,8 +12596,7 @@
<remark role="help-description-begin"/>
<para>
- Returns the collation for the character set of the string
- argument.
+ Returns the collation of the string argument.
</para>
<remark role="help-description-end"/>
@@ -12634,7 +12630,8 @@
<para>
Returns the connection ID (thread ID) for the connection.
- Every connection has its own unique ID.
+ Every connection has an ID that is unique among the set of
+ currently connected clients.
</para>
<remark role="help-description-end"/>
@@ -12666,13 +12663,14 @@
<remark role="help-description-begin"/>
<para>
- Returns the username and hostname combination that the
- current session was authenticated as. This value corresponds
- to the MySQL account that determines your access privileges.
- As of MySQL 5.0.10, within a stored routine that is defined
+ Returns the username and hostname combination for the MySQL
+ account that the server used to authenticate the current
+ client. This account determines your access privileges. As
+ of MySQL 5.0.10, within a stored routine that is defined
with the <literal>SQL SECURITY DEFINER</literal>
characteristic, <literal>CURRENT_USER()</literal> returns
- the creator of the routine.
+ the creator of the routine. The return value is a string in
+ the <literal>utf8</literal> character set.
</para>
<para>
@@ -12704,11 +12702,6 @@
occur is that there is no account listed in the grant tables
for <literal>davida</literal>.
</para>
-
- <para>
- The string returned by <literal>CURRENT_USER()</literal>
- uses the <literal>utf8</literal> character set.
- </para>
</listitem>
<listitem>
@@ -12775,9 +12768,9 @@
rows the server returns to the client. In some cases, it is
desirable to know how many rows the statement would have
returned without the <literal>LIMIT</literal>, but without
- running the statement again. To get this row count, include
- a <literal>SQL_CALC_FOUND_ROWS</literal> option in the
- <literal>SELECT</literal> statement, then invoke
+ running the statement again. To obtain this row count,
+ include a <literal>SQL_CALC_FOUND_ROWS</literal> option in
+ the <literal>SELECT</literal> statement, and then invoke
<literal>FOUND_ROWS()</literal> afterward:
</para>
Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml 2006-01-22 20:08:12 UTC (rev 989)
+++ trunk/refman-5.0/installing.xml 2006-01-22 20:08:26 UTC (rev 990)
@@ -12709,62 +12709,12 @@
your grant tables are current when you update to a new version
of MySQL, you should run the
<command>mysql_fix_privilege_tables</command> script to update
- your grant tables as well. The procedure for doing this is
- described at <xref linkend="mysql-fix-privilege-tables"/>.
+ your grant tables as well. Otherwise, there might be
+ capabilities that you cannot take advantage of. The procedure
+ for performing the update is described at
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
- <para>
- If you are upgrading to MySQL 5.0.1 or later, the grant table
- upgrade procedure adds view-related columns for the
- <literal>CREATE VIEW</literal> and <literal>SHOW VIEW</literal>
- privileges. These privileges exist at the global and database
- levels. Their initial values are assigned as follows:
- </para>
-
- <itemizedlist>
-
- <listitem>
- <para>
- In MySQL 5.0.2 or later,
- <command>mysql_fix_privilege_tables</command> copies the
- <literal>Create_priv</literal> value in the
- <literal>user</literal> table to the
- <literal>Create_view_priv</literal> and
- <literal>Show_view_priv</literal> columns.
- </para>
- </listitem>
-
- <listitem>
- <para>
- In 5.0.1, the view-related privileges are not enabled for
- any accounts, so you cannot immediately use
- <literal>GRANT</literal> to give them to accounts that
- should have them. To deal with this, first connect to the
- server as <literal>root</literal> and issue the following
- statements to give the privileges to the
- <literal>root</literal> accounts manually with
- <literal>UPDATE</literal>:
- </para>
-
-<programlisting>
-mysql> <userinput>UPDATE mysql.user SET Show_view_priv = 'Y', Create_view_priv = 'Y'</userinput>
- -> <userinput>WHERE User = 'root';</userinput>
-mysql> <userinput>FLUSH PRIVILEGES;</userinput>
-</programlisting>
-
- <para>
- After this, <literal>root</literal> can use
- <literal>GRANT</literal> to give the view privileges to
- other accounts. Note: You should issue the statements just
- shown; <literal>GRANT ALL</literal> does not work at the
- global and database levels, because <literal>GRANT</literal>
- requires that you actually possess the privileges you are
- granting.
- </para>
- </listitem>
-
- </itemizedlist>
-
</section>
<section id="upgrading-to-arch">
Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml 2006-01-22 20:08:12 UTC (rev 989)
+++ trunk/refman-5.1/charset.xml 2006-01-22 20:08:26 UTC (rev 990)
@@ -898,8 +898,8 @@
<title>&title-charset-national;</title>
<para>
- Standard SQL defines <literal>NCHAR</literal> or <literal>NATIONAL
- CHAR</literal> as a way to indicate that a
+ Standard SQL defines <literal>NCHAR</literal> or
+ <literal>NATIONAL CHAR</literal> as a way to indicate that a
<literal>CHAR</literal> column should use some predefined
character set. MySQL ¤t-series; uses
<literal>utf8</literal> as this predefined character set. For
@@ -1540,7 +1540,8 @@
<listitem>
<para>
- A column's collation has a coercibility of 2.
+ The collation of a column or a stored routine parameter or
+ local variable has a coercibility of 2.
</para>
</listitem>
@@ -1727,7 +1728,8 @@
<para>
The character that causes the different sort orders in this
example is the U with two dots over it
- (<literal>ü</literal>), which the Germans call <quote>U-umlaut.</quote>
+ (<literal>ü</literal>), which the Germans call
+ <quote>U-umlaut.</quote>
</para>
<itemizedlist>
@@ -2114,12 +2116,12 @@
<para>
In UCS-2 (binary Unicode representation), every character is
represented by a two-byte Unicode code with the most significant
- byte first. For example: <literal>LATIN CAPITAL LETTER A</literal> has the code
- <literal>0x0041</literal> and it is stored as a two-byte sequence:
- <literal>0x00 0x41</literal>. <literal>CYRILLIC SMALL LETTER YERU</literal>
- (Unicode <literal>0x044B</literal>) is stored as a two-byte
- sequence: <literal>0x04 0x4B</literal>. For Unicode characters and
- their codes, please refer to the
+ byte first. For example: <literal>LATIN CAPITAL LETTER A</literal>
+ has the code <literal>0x0041</literal> and it is stored as a
+ two-byte sequence: <literal>0x00 0x41</literal>. <literal>CYRILLIC
+ SMALL LETTER YERU</literal> (Unicode <literal>0x044B</literal>) is
+ stored as a two-byte sequence: <literal>0x04 0x4B</literal>. For
+ Unicode characters and their codes, please refer to the
<ulink url="http://www.unicode.org/">Unicode Home Page</ulink>.
</para>
Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml 2006-01-22 20:08:12 UTC (rev 989)
+++ trunk/refman-5.1/functions.xml 2006-01-22 20:08:26 UTC (rev 990)
@@ -12913,7 +12913,8 @@
</programlisting>
<para>
- The return values have the following meanings:
+ The return values have the meanings shown in the following
+ table. Lower values have higher precedence.
</para>
<informaltable>
@@ -12940,7 +12941,7 @@
<row>
<entry><literal>2</literal></entry>
<entry>Implicit collation</entry>
- <entry>Column value</entry>
+ <entry>Column value, stored routine parameter or local variable</entry>
</row>
<row>
<entry><literal>3</literal></entry>
@@ -12961,10 +12962,6 @@
</tbody>
</tgroup>
</informaltable>
-
- <para>
- Lower values have higher precedence.
- </para>
</listitem>
<listitem>
@@ -12985,8 +12982,7 @@
<remark role="help-description-begin"/>
<para>
- Returns the collation for the character set of the string
- argument.
+ Returns the collation of the string argument.
</para>
<remark role="help-description-end"/>
@@ -13020,7 +13016,8 @@
<para>
Returns the connection ID (thread ID) for the connection.
- Every connection has its own unique ID.
+ Every connection has an ID that is unique among the set of
+ currently connected clients.
</para>
<remark role="help-description-end"/>
@@ -13052,13 +13049,14 @@
<remark role="help-description-begin"/>
<para>
- Returns the username and hostname combination that the
- current session was authenticated as. This value corresponds
- to the MySQL account that determines your access privileges.
+ Returns the username and hostname combination for the MySQL
+ account that the server used to authenticate the current
+ client. This account determines your access privileges.
Within a stored routine that is defined with the
<literal>SQL SECURITY DEFINER</literal> characteristic,
<literal>CURRENT_USER()</literal> returns the creator of the
- routine.
+ routine. The return value is a string in the
+ <literal>utf8</literal> character set.
</para>
<para>
@@ -13090,11 +13088,6 @@
occur is that there is no account listed in the grant tables
for <literal>davida</literal>.
</para>
-
- <para>
- The string returned by <literal>CURRENT_USER()</literal>
- uses the <literal>utf8</literal> character set.
- </para>
</listitem>
<listitem>
@@ -13167,9 +13160,9 @@
rows the server returns to the client. In some cases, it is
desirable to know how many rows the statement would have
returned without the <literal>LIMIT</literal>, but without
- running the statement again. To get this row count, include
- a <literal>SQL_CALC_FOUND_ROWS</literal> option in the
- <literal>SELECT</literal> statement, then invoke
+ running the statement again. To obtain this row count,
+ include a <literal>SQL_CALC_FOUND_ROWS</literal> option in
+ the <literal>SELECT</literal> statement, and then invoke
<literal>FOUND_ROWS()</literal> afterward:
</para>
Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml 2006-01-22 20:08:12 UTC (rev 989)
+++ trunk/refman-5.1/installing.xml 2006-01-22 20:08:26 UTC (rev 990)
@@ -12227,23 +12227,12 @@
your grant tables are current when you update to a new version
of MySQL, you should run the
<command>mysql_fix_privilege_tables</command> script to update
- your grant tables as well. The procedure for doing this is
- described at <xref linkend="mysql-fix-privilege-tables"/>.
+ your grant tables as well. Otherwise, there might be
+ capabilities that you cannot take advantage of. The procedure
+ for performing the update is described at
+ <xref linkend="mysql-fix-privilege-tables"/>.
</para>
- <para>
- If you are upgrading from MySQL 4.1 or earlier, the grant table
- upgrade procedure adds view-related columns for the
- <literal>CREATE VIEW</literal> and <literal>SHOW VIEW</literal>
- privileges. These privileges exist at the global and database
- levels. In such cases, the MySQL ¤t-series; version of
- <command>mysql_fix_privilege_tables</command> copies the
- <literal>Create_priv</literal> value in the
- <literal>user</literal> table to the
- <literal>Create_view_priv</literal> and
- <literal>Show_view_priv</literal> columns.
- </para>
-
</section>
<section id="upgrading-to-arch">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r990 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 22 Jan |
