Author: paul
Date: 2006-12-14 16:26:26 +0100 (Thu, 14 Dec 2006)
New Revision: 4259
Log:
r13688@frost: paul | 2006-12-14 09:25:15 -0600
Fix typo in sysvar name. Add clarification re: SET CHARACTER SET.
(Thanks, Alik)
Modified:
trunk/refman-4.1/charset.xml
trunk/refman-5.0/charset.xml
trunk/refman-5.1/charset.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17184
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13677
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:12760
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:17184
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:13688
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:12760
Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml 2006-12-14 14:56:00 UTC (rev 4258)
+++ trunk/refman-4.1/charset.xml 2006-12-14 15:26:26 UTC (rev 4259)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 5; 1735 bytes
@@ -1298,9 +1298,10 @@
Setting <literal>character_set_connection</literal> to
<replaceable>x</replaceable> also sets
<literal>collation_connection</literal> to the default collation
- for <replaceable>x</replaceable>. To specify one of the character
- set's collations explicitly, use the optional
- <literal>COLLATE</literal> clause:
+ for <replaceable>x</replaceable>. It is not necessary to set that
+ collation explicitly. To specify a particular collation for the
+ character sets, use the optional <literal>COLLATE</literal>
+ clause:
</para>
<programlisting>
@@ -1310,7 +1311,7 @@
<para>
<literal>SET CHARACTER SET</literal> is similar to <literal>SET
NAMES</literal> but sets
- <literal>connection_character_set</literal> and
+ <literal>character_set_connection</literal> and
<literal>collation_connection</literal> to
<literal>character_set_database</literal> and
<literal>collation_database</literal>. A <literal>SET CHARACTER
@@ -1327,7 +1328,10 @@
<para>
Setting <literal>collation_connection</literal> also sets
<literal>character_set_connection</literal> to the character set
- associated with the collation.
+ associated with the collation (equivalent to executing
+ <literal>SET character_set_connection =
+ @@character_set_database</literal>). It is not necessary to set
+ <literal>character_set_connection</literal> explicitly.
</para>
<para>
Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml 2006-12-14 14:56:00 UTC (rev 4258)
+++ trunk/refman-5.0/charset.xml 2006-12-14 15:26:26 UTC (rev 4259)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 5; 1735 bytes
@@ -1296,9 +1296,10 @@
Setting <literal>character_set_connection</literal> to
<replaceable>x</replaceable> also sets
<literal>collation_connection</literal> to the default collation
- for <replaceable>x</replaceable>. To specify one of the character
- set's collations explicitly, use the optional
- <literal>COLLATE</literal> clause:
+ for <replaceable>x</replaceable>. It is not necessary to set that
+ collation explicitly. To specify a particular collation for the
+ character sets, use the optional <literal>COLLATE</literal>
+ clause:
</para>
<programlisting>
@@ -1308,7 +1309,7 @@
<para>
<literal>SET CHARACTER SET</literal> is similar to <literal>SET
NAMES</literal> but sets
- <literal>connection_character_set</literal> and
+ <literal>character_set_connection</literal> and
<literal>collation_connection</literal> to
<literal>character_set_database</literal> and
<literal>collation_database</literal>. A <literal>SET CHARACTER
@@ -1325,7 +1326,10 @@
<para>
Setting <literal>collation_connection</literal> also sets
<literal>character_set_connection</literal> to the character set
- associated with the collation.
+ associated with the collation (equivalent to executing
+ <literal>SET character_set_connection =
+ @@character_set_database</literal>). It is not necessary to set
+ <literal>character_set_connection</literal> explicitly.
</para>
<para>
Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml 2006-12-14 14:56:00 UTC (rev 4258)
+++ trunk/refman-5.1/charset.xml 2006-12-14 15:26:26 UTC (rev 4259)
Changed blocks: 3, Lines Added: 9, Lines Deleted: 5; 1735 bytes
@@ -1296,9 +1296,10 @@
Setting <literal>character_set_connection</literal> to
<replaceable>x</replaceable> also sets
<literal>collation_connection</literal> to the default collation
- for <replaceable>x</replaceable>. To specify one of the character
- set's collations explicitly, use the optional
- <literal>COLLATE</literal> clause:
+ for <replaceable>x</replaceable>. It is not necessary to set that
+ collation explicitly. To specify a particular collation for the
+ character sets, use the optional <literal>COLLATE</literal>
+ clause:
</para>
<programlisting>
@@ -1308,7 +1309,7 @@
<para>
<literal>SET CHARACTER SET</literal> is similar to <literal>SET
NAMES</literal> but sets
- <literal>connection_character_set</literal> and
+ <literal>character_set_connection</literal> and
<literal>collation_connection</literal> to
<literal>character_set_database</literal> and
<literal>collation_database</literal>. A <literal>SET CHARACTER
@@ -1325,7 +1326,10 @@
<para>
Setting <literal>collation_connection</literal> also sets
<literal>character_set_connection</literal> to the character set
- associated with the collation.
+ associated with the collation (equivalent to executing
+ <literal>SET character_set_connection =
+ @@character_set_database</literal>). It is not necessary to set
+ <literal>character_set_connection</literal> explicitly.
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r4259 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 14 Dec |
