List:Commits« Previous MessageNext Message »
From:paul Date:February 15 2006 6:19pm
Subject:svn commit - mysqldoc@docsrva: r1334 - in trunk: . refman-5.0 refman-5.1 refman-common
View as plain text  
Author: paul
Date: 2006-02-15 19:19:21 +0100 (Wed, 15 Feb 2006)
New Revision: 1334

Log:
 r3145@kite-hub:  paul | 2006-02-15 12:14:09 -0600
 Explain character_set_filesystem. (WL#2966)


Modified:
   trunk/
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/functions.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/functions.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-common/news-5.0.xml
   trunk/refman-common/news-5.1.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7578
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3045
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7578
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3145

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-02-15 17:23:31 UTC (rev 1333)
+++ trunk/refman-5.0/database-administration.xml	2006-02-15 18:19:21 UTC (rev 1334)
@@ -587,6 +587,18 @@
 
           <listitem>
             <para>
+              <option>--character-set-filesystem=<replaceable>charset_name</replaceable></option>
+            </para>
+
+            <para>
+              The filesystem character set. This option sets the
+              <literal>character_set_filesystem</literal> system
+              variable. It was added in MySQL 5.0.19.
+            </para>
+          </listitem>
+
+          <listitem>
+            <para>
               <option>--character-set-server=<replaceable>charset_name</replaceable></option>,
               <option>-C
               <replaceable>charset_name</replaceable></option>
@@ -2597,8 +2609,21 @@
             </para>
 
             <para>
-              The filesystem character set. The default value is
-              <literal>binary</literal>. This variable was added in
+              The filesystem character set. This variable is used to
+              interpret string literals that refer to filenames, such as
+              in the <literal>LOAD DATA INFILE</literal> and
+              <literal>SELECT ... INTO OUTFILE</literal> statements and
+              the <literal>LOAD_FILE()</literal> function. Such
+              filenames are converted from
+              <literal>character_set_client</literal> to
+              <literal>character_set_filesystem</literal> before the
+              file opening attempt occurs. The default value is
+              <literal>binary</literal>, which means that no conversion
+              occurs. For systems on which multi-byte filenames are
+              allowed, a different value may be more appropriate. For
+              example, if the system represents filenames using UTF-8,
+              set <literal>character_set_filesytem</literal> to
+              <literal>'utf8'</literal>. This variable was added in
               MySQL 5.0.19.
             </para>
           </listitem>
@@ -6244,17 +6269,17 @@
                   <entry><literal>GLOBAL</literal> | <literal>SESSION</literal>
 
                     <remark>
-                      Don't advertise this variable as being dynamic...
-                    </remark>
-
-
-
-                    <remark>
-                      @item @code{character_set_database} @tab string
-                      @tab @code{GLOBAL} | @code{SESSION}
+                      character_set_database can be changed, but don't
+                      advertise this variable as being dynamic because
+                      the server changes it automatically as necessary.
                     </remark></entry>
                 </row>
                 <row>
+                  <entry><literal>character_set_filesystem</literal></entry>
+                  <entry>string</entry>
+                  <entry><literal>GLOBAL</literal> | <literal>SESSION</literal></entry>
+                </row>
+                <row>
                   <entry><literal>character_set_results</literal></entry>
                   <entry>string</entry>
                   <entry><literal>GLOBAL</literal> | <literal>SESSION</literal></entry>

Modified: trunk/refman-5.0/functions.xml
===================================================================
--- trunk/refman-5.0/functions.xml	2006-02-15 17:23:31 UTC (rev 1333)
+++ trunk/refman-5.0/functions.xml	2006-02-15 18:19:21 UTC (rev 1334)
@@ -2830,6 +2830,13 @@
           returns <literal>NULL</literal>.
         </para>
 
+        <para>
+          As of MySQL 5.0.19, the
+          <literal>character_set_filesystem</literal> system variable
+          controls interpretation of filenames that are given as literal
+          strings.
+        </para>
+
         <remark role="help-description-end"/>
 
         <remark role="help-example"/>

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-02-15 17:23:31 UTC (rev 1333)
+++ trunk/refman-5.0/sql-syntax.xml	2006-02-15 18:19:21 UTC (rev 1334)
@@ -4791,6 +4791,12 @@
         use the <literal>ucs2</literal> character set.
       </para>
 
+      <para>
+        As of MySQL 5.0.19, the
+        <literal>character_set_filesystem</literal> system variable
+        controls the interpretation of the filename.
+      </para>
+
       <indexterm>
         <primary><command>mysqlimport</command></primary>
       </indexterm>
@@ -6588,7 +6594,9 @@
             syntax. <replaceable>file_name</replaceable> cannot be an
             existing file, which among other things prevents files such
             as <filename>/etc/passwd</filename> and database tables from
-            being destroyed.
+            being destroyed. As of MySQL 5.0.19, the
+            <literal>character_set_filesystem</literal> system variable
+            controls the interpretation of the filename.
           </para>
 
           <para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-02-15 17:23:31 UTC (rev 1333)
+++ trunk/refman-5.1/database-administration.xml	2006-02-15 18:19:21 UTC (rev 1334)
@@ -806,8 +806,9 @@
             </para>
 
             <para>
-              The filesystem character set. This option was added in
-              MySQL 5.1.6.
+              The filesystem character set. This option sets the
+              <literal>character_set_filesystem</literal> system
+              variable. It was added in MySQL 5.1.6.
             </para>
           </listitem>
 
@@ -2882,8 +2883,21 @@
             </para>
 
             <para>
-              The filesystem character set. The default value is
-              <literal>binary</literal>. This variable was added in
+              The filesystem character set. This variable is used to
+              interpret string literals that refer to filenames, such as
+              in the <literal>LOAD DATA INFILE</literal> and
+              <literal>SELECT ... INTO OUTFILE</literal> statements and
+              the <literal>LOAD_FILE()</literal> function. Such
+              filenames are converted from
+              <literal>character_set_client</literal> to
+              <literal>character_set_filesystem</literal> before the
+              file opening attempt occurs. The default value is
+              <literal>binary</literal>, which means that no conversion
+              occurs. For systems on which multi-byte filenames are
+              allowed, a different value may be more appropriate. For
+              example, if the system represents filenames using UTF-8,
+              set <literal>character_set_filesytem</literal> to
+              <literal>'utf8'</literal>. This variable was added in
               MySQL 5.1.6.
             </para>
           </listitem>
@@ -6532,17 +6546,17 @@
                   <entry><literal>GLOBAL</literal> | <literal>SESSION</literal>
 
                     <remark>
-                      Don't advertise this variable as being dynamic...
-                    </remark>
-
-
-
-                    <remark>
-                      @item @code{character_set_database} @tab string
-                      @tab @code{GLOBAL} | @code{SESSION}
+                      character_set_database can be changed, but don't
+                      advertise this variable as being dynamic because
+                      the server changes it automatically as necessary.
                     </remark></entry>
                 </row>
                 <row>
+                  <entry><literal>character_set_filesystem</literal></entry>
+                  <entry>string</entry>
+                  <entry><literal>GLOBAL</literal> | <literal>SESSION</literal></entry>
+                </row>
+                <row>
                   <entry><literal>character_set_results</literal></entry>
                   <entry>string</entry>
                   <entry><literal>GLOBAL</literal> | <literal>SESSION</literal></entry>

Modified: trunk/refman-5.1/functions.xml
===================================================================
--- trunk/refman-5.1/functions.xml	2006-02-15 17:23:31 UTC (rev 1333)
+++ trunk/refman-5.1/functions.xml	2006-02-15 18:19:21 UTC (rev 1334)
@@ -2802,6 +2802,13 @@
           returns <literal>NULL</literal>.
         </para>
 
+        <para>
+          As of MySQL 5.1.6, the
+          <literal>character_set_filesystem</literal> system variable
+          controls interpretation of filenames that are given as literal
+          strings.
+        </para>
+
         <remark role="help-description-end"/>
 
         <remark role="help-example"/>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-02-15 17:23:31 UTC (rev 1333)
+++ trunk/refman-5.1/sql-syntax.xml	2006-02-15 18:19:21 UTC (rev 1334)
@@ -5399,6 +5399,12 @@
         use the <literal>ucs2</literal> character set.
       </para>
 
+      <para>
+        As of MySQL 5.1.6, the
+        <literal>character_set_filesystem</literal> system variable
+        controls the interpretation of the filename.
+      </para>
+
       <indexterm>
         <primary><command>mysqlimport</command></primary>
       </indexterm>
@@ -7177,7 +7183,9 @@
             syntax. <replaceable>file_name</replaceable> cannot be an
             existing file, which among other things prevents files such
             as <filename>/etc/passwd</filename> and database tables from
-            being destroyed.
+            being destroyed. As of MySQL 5.1.6, the
+            <literal>character_set_filesystem</literal> system variable
+            controls the interpretation of the filename.
           </para>
 
           <para>

Modified: trunk/refman-common/news-5.0.xml
===================================================================
--- trunk/refman-common/news-5.0.xml	2006-02-15 17:23:31 UTC (rev 1333)
+++ trunk/refman-common/news-5.0.xml	2006-02-15 18:19:21 UTC (rev 1334)
@@ -284,13 +284,6 @@
         </para>
       </listitem>
 
-      <listitem>
-        <para>
-          Added the <literal>character_set_filesystem</literal> system
-          variable.
-        </para>
-      </listitem>
-
     </itemizedlist>
 
     <para>
@@ -605,6 +598,16 @@
 
       <listitem>
         <para>
+          Multi-byte path names for <literal>LOAD DATA</literal> and
+          <literal>SELECT ... INTO OUTFILE</literal> caused errors.
+          Added the <literal>character_set_filesystem</literal> system
+          variable, which controls the interpretation of string literals
+          that refer to filenames. (Bug #12448)
+        </para>
+      </listitem>
+
+      <listitem>
+        <para>
           Certain subqueries where the inner query is the result of a
           aggregate function would return different results on MySQL 5.0
           than on MySQL 4.1. (Bug #15347)

Modified: trunk/refman-common/news-5.1.xml
===================================================================
--- trunk/refman-common/news-5.1.xml	2006-02-15 17:23:31 UTC (rev 1333)
+++ trunk/refman-common/news-5.1.xml	2006-02-15 18:19:21 UTC (rev 1334)
@@ -545,13 +545,6 @@
 
       <listitem>
         <para>
-          Added the <literal>character_set_filesystem</literal> system
-          variable.
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
           Added the <literal>event_scheduler</literal> system variable.
         </para>
       </listitem>
@@ -704,8 +697,10 @@
       <listitem>
         <para>
           Multi-byte path names for <literal>LOAD DATA</literal> and
-          <literal>SELECT ... INTO OUTFILE</literal> caused errors. (Bug
-          #12448)
+          <literal>SELECT ... INTO OUTFILE</literal> caused errors.
+          Added the <literal>character_set_filesystem</literal> system
+          variable, which controls the interpretation of string literals
+          that refer to filenames. (Bug #12448)
         </para>
       </listitem>
 

Thread
svn commit - mysqldoc@docsrva: r1334 - in trunk: . refman-5.0 refman-5.1 refman-commonpaul15 Feb