svn commit - mysqldoc@docsrva: r8090 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.2

[paul]

Author: paul
Date: 2007-10-15 16:00:41 +0200 (Mon, 15 Oct 2007)
New Revision: 8090

Log:
 r25618@frost:  paul | 2007-10-15 08:38:02 -0500
 Add clarfication re: use of server charset/collation. (Bug#31489)


Modified:
   trunk/refman-4.1/charset.xml
   trunk/refman-5.0/charset.xml
   trunk/refman-5.1/charset.xml
   trunk/refman-5.2/charset.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:31047
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25617
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:31047
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25618
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005


Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml	2007-10-15 14:00:22 UTC (rev 8089)
+++ trunk/refman-4.1/charset.xml	2007-10-15 14:00:41 UTC (rev 8090)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 0; 769 bytes

@@ -477,6 +477,13 @@
       </para>
 
       <para>
+        The server character set and collation are used as default
+        values if the database character set and collation are not
+        specified in <literal>CREATE DATABASE</literal> statements. They
+        have no other purpose.
+      </para>
+
+      <para>
         The current server character set and collation can be determined
         from the values of the <literal>character_set_server</literal>
         and <literal>collation_server</literal> system variables. These


Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml	2007-10-15 14:00:22 UTC (rev 8089)
+++ trunk/refman-5.0/charset.xml	2007-10-15 14:00:41 UTC (rev 8090)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 2; 1289 bytes

@@ -463,6 +463,13 @@
       </para>
 
       <para>
+        The server character set and collation are used as default
+        values if the database character set and collation are not
+        specified in <literal>CREATE DATABASE</literal> statements. They
+        have no other purpose.
+      </para>
+
+      <para>
         The current server character set and collation can be determined
         from the values of the <literal>character_set_server</literal>
         and <literal>collation_server</literal> system variables. These

@@ -565,8 +572,10 @@
       <para>
         The database character set and collation are used as default
         values if the table character set and collation are not
-        specified in <literal>CREATE TABLE</literal> statements. They
-        have no other purpose.
+        specified in <literal>CREATE TABLE</literal> statements. The
+        database character set also is used by <literal>LOAD DATA
+        INFILE</literal>. The character set and collation have no other
+        purposes.
       </para>
 
       <para>


Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml	2007-10-15 14:00:22 UTC (rev 8089)
+++ trunk/refman-5.1/charset.xml	2007-10-15 14:00:41 UTC (rev 8090)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 2; 1289 bytes

@@ -463,6 +463,13 @@
       </para>
 
       <para>
+        The server character set and collation are used as default
+        values if the database character set and collation are not
+        specified in <literal>CREATE DATABASE</literal> statements. They
+        have no other purpose.
+      </para>
+
+      <para>
         The current server character set and collation can be determined
         from the values of the <literal>character_set_server</literal>
         and <literal>collation_server</literal> system variables. These

@@ -565,8 +572,10 @@
       <para>
         The database character set and collation are used as default
         values if the table character set and collation are not
-        specified in <literal>CREATE TABLE</literal> statements. They
-        have no other purpose.
+        specified in <literal>CREATE TABLE</literal> statements. The
+        database character set also is used by <literal>LOAD DATA
+        INFILE</literal>. The character set and collation have no other
+        purposes.
       </para>
 
       <para>


Modified: trunk/refman-5.2/charset.xml
===================================================================
--- trunk/refman-5.2/charset.xml	2007-10-15 14:00:22 UTC (rev 8089)
+++ trunk/refman-5.2/charset.xml	2007-10-15 14:00:41 UTC (rev 8090)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 2; 1289 bytes

@@ -463,6 +463,13 @@
       </para>
 
       <para>
+        The server character set and collation are used as default
+        values if the database character set and collation are not
+        specified in <literal>CREATE DATABASE</literal> statements. They
+        have no other purpose.
+      </para>
+
+      <para>
         The current server character set and collation can be determined
         from the values of the <literal>character_set_server</literal>
         and <literal>collation_server</literal> system variables. These

@@ -565,8 +572,10 @@
       <para>
         The database character set and collation are used as default
         values if the table character set and collation are not
-        specified in <literal>CREATE TABLE</literal> statements. They
-        have no other purpose.
+        specified in <literal>CREATE TABLE</literal> statements. The
+        database character set also is used by <literal>LOAD DATA
+        INFILE</literal>. The character set and collation have no other
+        purposes.
       </para>
 
       <para>