List:Commits« Previous MessageNext Message »
From:paul Date:December 15 2007 7:00pm
Subject:svn commit - mysqldoc@docsrva: r9336 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0
View as plain text  
Author: paul
Date: 2007-12-15 20:00:51 +0100 (Sat, 15 Dec 2007)
New Revision: 9336

Log:
 r28181@frost:  paul | 2007-12-15 11:16:35 -0600
 Move some material around, kill todo.


Modified:
   trunk/it/refman-5.1/programs-admin-util.xml
   trunk/it/refman-5.1/programs-development.xml
   trunk/it/refman-5.1/programs-using.xml
   trunk/it/refman-5.1/programs.xml
   trunk/pt/refman-5.1/programs-admin-util.xml
   trunk/pt/refman-5.1/programs-development.xml
   trunk/pt/refman-5.1/programs-using.xml
   trunk/pt/refman-5.1/programs.xml
   trunk/refman-4.1/programs-development.xml
   trunk/refman-4.1/programs-using.xml
   trunk/refman-4.1/programs.xml
   trunk/refman-5.0/programs-development.xml
   trunk/refman-5.0/programs-using.xml
   trunk/refman-5.0/programs.xml
   trunk/refman-5.1/programs-development.xml
   trunk/refman-5.1/programs-using.xml
   trunk/refman-5.1/programs.xml
   trunk/refman-6.0/programs-development.xml
   trunk/refman-6.0/programs-using.xml
   trunk/refman-6.0/programs.xml
   trunk/refman-6.0/unicode-tmp.xml

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


Modified: trunk/it/refman-5.1/programs-admin-util.xml
===================================================================
--- trunk/it/refman-5.1/programs-admin-util.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/it/refman-5.1/programs-admin-util.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 7; 2057 bytes

@@ -8077,13 +8077,13 @@
       <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
       <refmiscinfo class="source">MySQL</refmiscinfo>
       <refmiscinfo class="version">&current-series;</refmiscinfo>
-      <refmiscinfo class="refman">Make Table Filename Extensions Lowercase</refmiscinfo>
+      <refmiscinfo class="refman">Normalize Table Filename Extensions</refmiscinfo>
     </refmeta>
 
     <refnamediv>
       <refname>mysql_fix_extensions</refname>
        
-      <refpurpose>make table filename extensions lowercase</refpurpose>
+      <refpurpose>normalize table filename extensions</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>

@@ -8098,12 +8098,13 @@
 
       <para>
         <command>mysql_fix_extensions</command> converts the extensions
-        for <literal>MyISAM</literal> table files to lowercase. It looks
-        for files with an extension that that matches any lettercase
-        variant of <filename>.frm</filename>, <filename>.myd</filename>,
+        for <literal>MyISAM</literal> (or <literal>ISAM</literal>) table
+        files to their canonical forms. It looks for files with
+        extensions matching any lettercase variant of
+        <filename>.frm</filename>, <filename>.myd</filename>,
         <filename>.myi</filename>, <filename>.isd</filename>, and
-        <filename>.ism</filename> and renames them to have extensionsn
-        of <filename>.frm</filename>, <filename>.MYD</filename>,
+        <filename>.ism</filename> and renames them to have extensions of
+        <filename>.frm</filename>, <filename>.MYD</filename>,
         <filename>.MYI</filename>, <filename>.ISD</filename>, and
         <filename>.ISM</filename>, respectively. This can be useful
         after transferring the files from a system with case-insensitive


Modified: trunk/it/refman-5.1/programs-development.xml
===================================================================
--- trunk/it/refman-5.1/programs-development.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/it/refman-5.1/programs-development.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 4, Lines Added: 43, Lines Deleted: 5; 3128 bytes

@@ -12,6 +12,41 @@
     developing MySQL programs.
   </para>
 
+  <para>
+    In shell scripts, you can use the
+    <command>my_print_defaults</command> program to parse option files
+    and see what options would be used by a given program. The following
+    example shows the output that <command>my_print_defaults</command>
+    might produce when asked to show the options found in the
+    <literal>[client]</literal> and <literal>[mysql]</literal> groups:
+  </para>
+
+<programlisting>
+shell&gt; <userinput>my_print_defaults client mysql</userinput>
+--port=3306
+--socket=/tmp/mysql.sock
+--no-auto-rehash
+</programlisting>
+
+  <para>
+    <emphasis role="bold">Note for developers</emphasis>: Option file
+    handling is implemented in the C client library simply by processing
+    all options in the appropriate group or groups before any
+    command-line arguments. This works well for programs that use the
+    last instance of an option that is specified multiple times. If you
+    have a C or C++ program that handles multiply specified options this
+    way but that doesn't read option files, you need add only two lines
+    to give it that capability. Check the source code of any of the
+    standard MySQL clients to see how to do this.
+  </para>
+
+  <para>
+    Several other language interfaces to MySQL are based on the C client
+    library, and some of them provide a way to access option file
+    contents. These include Perl and Python. For details, see the
+    documentation for your preferred interface.
+  </para>
+
   <refentry id="msql2mysql">
 
     <indexterm>

@@ -132,7 +167,12 @@
           <para>
             Compiler flags to find include files and critical compiler
             flags and defines used when compiling the
-            <literal>libmysqlclient</literal> library.
+            <literal>libmysqlclient</literal> library. The options
+            returned are tied to the specific compiler that was used
+            when the library was created and might clash with the
+            settings for your own compiler. Use
+            <option>--include</option> for more portable options that
+            contain only include paths.
           </para>
         </listitem>
 

@@ -142,9 +182,7 @@
           </para>
 
           <para>
-            Compiler options to find MySQL include files. (Note that
-            normally you would use <option>--cflags</option> instead of
-            this option.)
+            Compiler options to find MySQL include files.
           </para>
         </listitem>
 

@@ -248,7 +286,7 @@
 
 <programlisting>
 shell&gt; <userinput>CFG=/usr/local/mysql/bin/mysql_config</userinput>
-shell&gt; <userinput>sh -c "gcc -o progname `$CFG --cflags` progname.c `$CFG --libs`"</userinput>
+shell&gt; <userinput>sh -c "gcc -o progname `$CFG --include` progname.c `$CFG --libs`"</userinput>
 </programlisting>
 
       <para>


Modified: trunk/it/refman-5.1/programs-using.xml
===================================================================
--- trunk/it/refman-5.1/programs-using.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/it/refman-5.1/programs-using.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 41; 2218 bytes

@@ -954,48 +954,7 @@
 new
 </programlisting>
 
-      <remark role="todo">
-        The next few paragraphs probably should go into the API chapter.
-      </remark>
-
       <para>
-        In shell scripts, you can use the
-        <command>my_print_defaults</command> program to parse option
-        files and see what options would be used by a given program. The
-        following example shows the output that
-        <command>my_print_defaults</command> might produce when asked to
-        show the options found in the <literal>[client]</literal> and
-        <literal>[mysql]</literal> groups:
-      </para>
-
-<programlisting>
-shell&gt; <userinput>my_print_defaults client mysql</userinput>
---port=3306
---socket=/tmp/mysql.sock
---no-auto-rehash
-</programlisting>
-
-      <para>
-        <emphasis role="bold">Note for developers</emphasis>: Option
-        file handling is implemented in the C client library simply by
-        processing all options in the appropriate group or groups before
-        any command-line arguments. This works well for programs that
-        use the last instance of an option that is specified multiple
-        times. If you have a C or C++ program that handles multiply
-        specified options this way but that doesn't read option files,
-        you need add only two lines to give it that capability. Check
-        the source code of any of the standard MySQL clients to see how
-        to do this.
-      </para>
-
-      <para>
-        Several other language interfaces to MySQL are based on the C
-        client library, and some of them provide a way to access option
-        file contents. These include Perl and Python. For details, see
-        the documentation for your preferred interface.
-      </para>
-
-      <para>
         It is possible to use <literal>!include</literal> directives in
         option files to include other option files and
         <literal>!includedir</literal> to search specific directories


Modified: trunk/it/refman-5.1/programs.xml
===================================================================
--- trunk/it/refman-5.1/programs.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/it/refman-5.1/programs.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 4; 441 bytes

@@ -144,10 +144,6 @@
       MySQL installation or upgrading:
     </para>
 
-    <remark role="todo">
-      indicate where these are discussed
-    </remark>
-
     <itemizedlist>
 
       <listitem>


Modified: trunk/pt/refman-5.1/programs-admin-util.xml
===================================================================
--- trunk/pt/refman-5.1/programs-admin-util.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/pt/refman-5.1/programs-admin-util.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 7; 2057 bytes

@@ -8077,13 +8077,13 @@
       <refmiscinfo class="manual">MySQL Database System</refmiscinfo>
       <refmiscinfo class="source">MySQL</refmiscinfo>
       <refmiscinfo class="version">&current-series;</refmiscinfo>
-      <refmiscinfo class="refman">Make Table Filename Extensions Lowercase</refmiscinfo>
+      <refmiscinfo class="refman">Normalize Table Filename Extensions</refmiscinfo>
     </refmeta>
 
     <refnamediv>
       <refname>mysql_fix_extensions</refname>
        
-      <refpurpose>make table filename extensions lowercase</refpurpose>
+      <refpurpose>normalize table filename extensions</refpurpose>
     </refnamediv>
 
     <refsynopsisdiv>

@@ -8098,12 +8098,13 @@
 
       <para>
         <command>mysql_fix_extensions</command> converts the extensions
-        for <literal>MyISAM</literal> table files to lowercase. It looks
-        for files with an extension that that matches any lettercase
-        variant of <filename>.frm</filename>, <filename>.myd</filename>,
+        for <literal>MyISAM</literal> (or <literal>ISAM</literal>) table
+        files to their canonical forms. It looks for files with
+        extensions matching any lettercase variant of
+        <filename>.frm</filename>, <filename>.myd</filename>,
         <filename>.myi</filename>, <filename>.isd</filename>, and
-        <filename>.ism</filename> and renames them to have extensionsn
-        of <filename>.frm</filename>, <filename>.MYD</filename>,
+        <filename>.ism</filename> and renames them to have extensions of
+        <filename>.frm</filename>, <filename>.MYD</filename>,
         <filename>.MYI</filename>, <filename>.ISD</filename>, and
         <filename>.ISM</filename>, respectively. This can be useful
         after transferring the files from a system with case-insensitive


Modified: trunk/pt/refman-5.1/programs-development.xml
===================================================================
--- trunk/pt/refman-5.1/programs-development.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/pt/refman-5.1/programs-development.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 4, Lines Added: 43, Lines Deleted: 5; 3128 bytes

@@ -12,6 +12,41 @@
     developing MySQL programs.
   </para>
 
+  <para>
+    In shell scripts, you can use the
+    <command>my_print_defaults</command> program to parse option files
+    and see what options would be used by a given program. The following
+    example shows the output that <command>my_print_defaults</command>
+    might produce when asked to show the options found in the
+    <literal>[client]</literal> and <literal>[mysql]</literal> groups:
+  </para>
+
+<programlisting>
+shell&gt; <userinput>my_print_defaults client mysql</userinput>
+--port=3306
+--socket=/tmp/mysql.sock
+--no-auto-rehash
+</programlisting>
+
+  <para>
+    <emphasis role="bold">Note for developers</emphasis>: Option file
+    handling is implemented in the C client library simply by processing
+    all options in the appropriate group or groups before any
+    command-line arguments. This works well for programs that use the
+    last instance of an option that is specified multiple times. If you
+    have a C or C++ program that handles multiply specified options this
+    way but that doesn't read option files, you need add only two lines
+    to give it that capability. Check the source code of any of the
+    standard MySQL clients to see how to do this.
+  </para>
+
+  <para>
+    Several other language interfaces to MySQL are based on the C client
+    library, and some of them provide a way to access option file
+    contents. These include Perl and Python. For details, see the
+    documentation for your preferred interface.
+  </para>
+
   <refentry id="msql2mysql">
 
     <indexterm>

@@ -132,7 +167,12 @@
           <para>
             Compiler flags to find include files and critical compiler
             flags and defines used when compiling the
-            <literal>libmysqlclient</literal> library.
+            <literal>libmysqlclient</literal> library. The options
+            returned are tied to the specific compiler that was used
+            when the library was created and might clash with the
+            settings for your own compiler. Use
+            <option>--include</option> for more portable options that
+            contain only include paths.
           </para>
         </listitem>
 

@@ -142,9 +182,7 @@
           </para>
 
           <para>
-            Compiler options to find MySQL include files. (Note that
-            normally you would use <option>--cflags</option> instead of
-            this option.)
+            Compiler options to find MySQL include files.
           </para>
         </listitem>
 

@@ -248,7 +286,7 @@
 
 <programlisting>
 shell&gt; <userinput>CFG=/usr/local/mysql/bin/mysql_config</userinput>
-shell&gt; <userinput>sh -c "gcc -o progname `$CFG --cflags` progname.c `$CFG --libs`"</userinput>
+shell&gt; <userinput>sh -c "gcc -o progname `$CFG --include` progname.c `$CFG --libs`"</userinput>
 </programlisting>
 
       <para>


Modified: trunk/pt/refman-5.1/programs-using.xml
===================================================================
--- trunk/pt/refman-5.1/programs-using.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/pt/refman-5.1/programs-using.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 41; 2218 bytes

@@ -954,48 +954,7 @@
 new
 </programlisting>
 
-      <remark role="todo">
-        The next few paragraphs probably should go into the API chapter.
-      </remark>
-
       <para>
-        In shell scripts, you can use the
-        <command>my_print_defaults</command> program to parse option
-        files and see what options would be used by a given program. The
-        following example shows the output that
-        <command>my_print_defaults</command> might produce when asked to
-        show the options found in the <literal>[client]</literal> and
-        <literal>[mysql]</literal> groups:
-      </para>
-
-<programlisting>
-shell&gt; <userinput>my_print_defaults client mysql</userinput>
---port=3306
---socket=/tmp/mysql.sock
---no-auto-rehash
-</programlisting>
-
-      <para>
-        <emphasis role="bold">Note for developers</emphasis>: Option
-        file handling is implemented in the C client library simply by
-        processing all options in the appropriate group or groups before
-        any command-line arguments. This works well for programs that
-        use the last instance of an option that is specified multiple
-        times. If you have a C or C++ program that handles multiply
-        specified options this way but that doesn't read option files,
-        you need add only two lines to give it that capability. Check
-        the source code of any of the standard MySQL clients to see how
-        to do this.
-      </para>
-
-      <para>
-        Several other language interfaces to MySQL are based on the C
-        client library, and some of them provide a way to access option
-        file contents. These include Perl and Python. For details, see
-        the documentation for your preferred interface.
-      </para>
-
-      <para>
         It is possible to use <literal>!include</literal> directives in
         option files to include other option files and
         <literal>!includedir</literal> to search specific directories


Modified: trunk/pt/refman-5.1/programs.xml
===================================================================
--- trunk/pt/refman-5.1/programs.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/pt/refman-5.1/programs.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 4; 441 bytes

@@ -144,10 +144,6 @@
       MySQL installation or upgrading:
     </para>
 
-    <remark role="todo">
-      indicate where these are discussed
-    </remark>
-
     <itemizedlist>
 
       <listitem>


Modified: trunk/refman-4.1/programs-development.xml
===================================================================
--- trunk/refman-4.1/programs-development.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-4.1/programs-development.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 2, Lines Added: 40, Lines Deleted: 4; 2672 bytes

@@ -12,6 +12,41 @@
     developing MySQL programs.
   </para>
 
+  <para>
+    In shell scripts, you can use the
+    <command>my_print_defaults</command> program to parse option files
+    and see what options would be used by a given program. The following
+    example shows the output that <command>my_print_defaults</command>
+    might produce when asked to show the options found in the
+    <literal>[client]</literal> and <literal>[mysql]</literal> groups:
+  </para>
+
+<programlisting>
+shell&gt; <userinput>my_print_defaults client mysql</userinput>
+--port=3306
+--socket=/tmp/mysql.sock
+--no-auto-rehash
+</programlisting>
+
+  <para>
+    <emphasis role="bold">Note for developers</emphasis>: Option file
+    handling is implemented in the C client library simply by processing
+    all options in the appropriate group or groups before any
+    command-line arguments. This works well for programs that use the
+    last instance of an option that is specified multiple times. If you
+    have a C or C++ program that handles multiply specified options this
+    way but that doesn't read option files, you need add only two lines
+    to give it that capability. Check the source code of any of the
+    standard MySQL clients to see how to do this.
+  </para>
+
+  <para>
+    Several other language interfaces to MySQL are based on the C client
+    library, and some of them provide a way to access option file
+    contents. These include Perl and Python. For details, see the
+    documentation for your preferred interface.
+  </para>
+
   <refentry id="msql2mysql">
 
     <indexterm>

@@ -133,10 +168,11 @@
             Compiler flags to find include files and critical compiler
             flags and defines used when compiling the
             <literal>libmysqlclient</literal> library. The options
-            returns are tied to the specific compiler that was used when
-            the library was created and might clash with the settings
-            for your own compiler. Use <option>--include</option> for
-            more portable options that contain only include paths.
+            returned are tied to the specific compiler that was used
+            when the library was created and might clash with the
+            settings for your own compiler. Use
+            <option>--include</option> for more portable options that
+            contain only include paths.
           </para>
         </listitem>
 


Modified: trunk/refman-4.1/programs-using.xml
===================================================================
--- trunk/refman-4.1/programs-using.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-4.1/programs-using.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 41; 2210 bytes

@@ -945,48 +945,7 @@
 new
 </programlisting>
 
-      <remark role="todo">
-        The next few paragraphs probably should go into the API chapter.
-      </remark>
-
       <para>
-        In shell scripts, you can use the
-        <command>my_print_defaults</command> program to parse option
-        files and see what options would be used by a given program. The
-        following example shows the output that
-        <command>my_print_defaults</command> might produce when asked to
-        show the options found in the <literal>[client]</literal> and
-        <literal>[mysql]</literal> groups:
-      </para>
-
-<programlisting>
-shell&gt; <userinput>my_print_defaults client mysql</userinput>
---port=3306
---socket=/tmp/mysql.sock
---no-auto-rehash
-</programlisting>
-
-      <para>
-        <emphasis role="bold">Note for developers</emphasis>: Option
-        file handling is implemented in the C client library simply by
-        processing all options in the appropriate group or groups before
-        any command-line arguments. This works well for programs that
-        use the last instance of an option that is specified multiple
-        times. If you have a C or C++ program that handles multiply
-        specified options this way but that doesn't read option files,
-        you need add only two lines to give it that capability. Check
-        the source code of any of the standard MySQL clients to see how
-        to do this.
-      </para>
-
-      <para>
-        Several other language interfaces to MySQL are based on the C
-        client library, and some of them provide a way to access option
-        file contents. These include Perl and Python. For details, see
-        the documentation for your preferred interface.
-      </para>
-
-      <para>
         Beginning with MySQL 4.1.11, it is possible to use
         <literal>!include</literal> directives in option files to
         include other option files and <literal>!includedir</literal> to


Modified: trunk/refman-4.1/programs.xml
===================================================================
--- trunk/refman-4.1/programs.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-4.1/programs.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 4; 432 bytes

@@ -157,10 +157,6 @@
       MySQL installation or upgrading:
     </para>
 
-    <remark role="todo">
-      indicate where these are discussed
-    </remark>
-
     <itemizedlist>
 
       <listitem>


Modified: trunk/refman-5.0/programs-development.xml
===================================================================
--- trunk/refman-5.0/programs-development.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-5.0/programs-development.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 2, Lines Added: 40, Lines Deleted: 4; 2672 bytes

@@ -12,6 +12,41 @@
     developing MySQL programs.
   </para>
 
+  <para>
+    In shell scripts, you can use the
+    <command>my_print_defaults</command> program to parse option files
+    and see what options would be used by a given program. The following
+    example shows the output that <command>my_print_defaults</command>
+    might produce when asked to show the options found in the
+    <literal>[client]</literal> and <literal>[mysql]</literal> groups:
+  </para>
+
+<programlisting>
+shell&gt; <userinput>my_print_defaults client mysql</userinput>
+--port=3306
+--socket=/tmp/mysql.sock
+--no-auto-rehash
+</programlisting>
+
+  <para>
+    <emphasis role="bold">Note for developers</emphasis>: Option file
+    handling is implemented in the C client library simply by processing
+    all options in the appropriate group or groups before any
+    command-line arguments. This works well for programs that use the
+    last instance of an option that is specified multiple times. If you
+    have a C or C++ program that handles multiply specified options this
+    way but that doesn't read option files, you need add only two lines
+    to give it that capability. Check the source code of any of the
+    standard MySQL clients to see how to do this.
+  </para>
+
+  <para>
+    Several other language interfaces to MySQL are based on the C client
+    library, and some of them provide a way to access option file
+    contents. These include Perl and Python. For details, see the
+    documentation for your preferred interface.
+  </para>
+
   <refentry id="msql2mysql">
 
     <indexterm>

@@ -133,10 +168,11 @@
             Compiler flags to find include files and critical compiler
             flags and defines used when compiling the
             <literal>libmysqlclient</literal> library. The options
-            returns are tied to the specific compiler that was used when
-            the library was created and might clash with the settings
-            for your own compiler. Use <option>--include</option> for
-            more portable options that contain only include paths.
+            returned are tied to the specific compiler that was used
+            when the library was created and might clash with the
+            settings for your own compiler. Use
+            <option>--include</option> for more portable options that
+            contain only include paths.
           </para>
         </listitem>
 


Modified: trunk/refman-5.0/programs-using.xml
===================================================================
--- trunk/refman-5.0/programs-using.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-5.0/programs-using.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 41; 2209 bytes

@@ -952,48 +952,7 @@
 new
 </programlisting>
 
-      <remark role="todo">
-        The next few paragraphs probably should go into the API chapter.
-      </remark>
-
       <para>
-        In shell scripts, you can use the
-        <command>my_print_defaults</command> program to parse option
-        files and see what options would be used by a given program. The
-        following example shows the output that
-        <command>my_print_defaults</command> might produce when asked to
-        show the options found in the <literal>[client]</literal> and
-        <literal>[mysql]</literal> groups:
-      </para>
-
-<programlisting>
-shell&gt; <userinput>my_print_defaults client mysql</userinput>
---port=3306
---socket=/tmp/mysql.sock
---no-auto-rehash
-</programlisting>
-
-      <para>
-        <emphasis role="bold">Note for developers</emphasis>: Option
-        file handling is implemented in the C client library simply by
-        processing all options in the appropriate group or groups before
-        any command-line arguments. This works well for programs that
-        use the last instance of an option that is specified multiple
-        times. If you have a C or C++ program that handles multiply
-        specified options this way but that doesn't read option files,
-        you need add only two lines to give it that capability. Check
-        the source code of any of the standard MySQL clients to see how
-        to do this.
-      </para>
-
-      <para>
-        Several other language interfaces to MySQL are based on the C
-        client library, and some of them provide a way to access option
-        file contents. These include Perl and Python. For details, see
-        the documentation for your preferred interface.
-      </para>
-
-      <para>
         Beginning with MySQL 5.0.4, it is possible to use
         <literal>!include</literal> directives in option files to
         include other option files and <literal>!includedir</literal> to


Modified: trunk/refman-5.0/programs.xml
===================================================================
--- trunk/refman-5.0/programs.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-5.0/programs.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 4; 432 bytes

@@ -145,10 +145,6 @@
       MySQL installation or upgrading:
     </para>
 
-    <remark role="todo">
-      indicate where these are discussed
-    </remark>
-
     <itemizedlist>
 
       <listitem>


Modified: trunk/refman-5.1/programs-development.xml
===================================================================
--- trunk/refman-5.1/programs-development.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-5.1/programs-development.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 2, Lines Added: 40, Lines Deleted: 4; 2672 bytes

@@ -12,6 +12,41 @@
     developing MySQL programs.
   </para>
 
+  <para>
+    In shell scripts, you can use the
+    <command>my_print_defaults</command> program to parse option files
+    and see what options would be used by a given program. The following
+    example shows the output that <command>my_print_defaults</command>
+    might produce when asked to show the options found in the
+    <literal>[client]</literal> and <literal>[mysql]</literal> groups:
+  </para>
+
+<programlisting>
+shell&gt; <userinput>my_print_defaults client mysql</userinput>
+--port=3306
+--socket=/tmp/mysql.sock
+--no-auto-rehash
+</programlisting>
+
+  <para>
+    <emphasis role="bold">Note for developers</emphasis>: Option file
+    handling is implemented in the C client library simply by processing
+    all options in the appropriate group or groups before any
+    command-line arguments. This works well for programs that use the
+    last instance of an option that is specified multiple times. If you
+    have a C or C++ program that handles multiply specified options this
+    way but that doesn't read option files, you need add only two lines
+    to give it that capability. Check the source code of any of the
+    standard MySQL clients to see how to do this.
+  </para>
+
+  <para>
+    Several other language interfaces to MySQL are based on the C client
+    library, and some of them provide a way to access option file
+    contents. These include Perl and Python. For details, see the
+    documentation for your preferred interface.
+  </para>
+
   <refentry id="msql2mysql">
 
     <indexterm>

@@ -133,10 +168,11 @@
             Compiler flags to find include files and critical compiler
             flags and defines used when compiling the
             <literal>libmysqlclient</literal> library. The options
-            returns are tied to the specific compiler that was used when
-            the library was created and might clash with the settings
-            for your own compiler. Use <option>--include</option> for
-            more portable options that contain only include paths.
+            returned are tied to the specific compiler that was used
+            when the library was created and might clash with the
+            settings for your own compiler. Use
+            <option>--include</option> for more portable options that
+            contain only include paths.
           </para>
         </listitem>
 


Modified: trunk/refman-5.1/programs-using.xml
===================================================================
--- trunk/refman-5.1/programs-using.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-5.1/programs-using.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 41; 2209 bytes

@@ -954,48 +954,7 @@
 new
 </programlisting>
 
-      <remark role="todo">
-        The next few paragraphs probably should go into the API chapter.
-      </remark>
-
       <para>
-        In shell scripts, you can use the
-        <command>my_print_defaults</command> program to parse option
-        files and see what options would be used by a given program. The
-        following example shows the output that
-        <command>my_print_defaults</command> might produce when asked to
-        show the options found in the <literal>[client]</literal> and
-        <literal>[mysql]</literal> groups:
-      </para>
-
-<programlisting>
-shell&gt; <userinput>my_print_defaults client mysql</userinput>
---port=3306
---socket=/tmp/mysql.sock
---no-auto-rehash
-</programlisting>
-
-      <para>
-        <emphasis role="bold">Note for developers</emphasis>: Option
-        file handling is implemented in the C client library simply by
-        processing all options in the appropriate group or groups before
-        any command-line arguments. This works well for programs that
-        use the last instance of an option that is specified multiple
-        times. If you have a C or C++ program that handles multiply
-        specified options this way but that doesn't read option files,
-        you need add only two lines to give it that capability. Check
-        the source code of any of the standard MySQL clients to see how
-        to do this.
-      </para>
-
-      <para>
-        Several other language interfaces to MySQL are based on the C
-        client library, and some of them provide a way to access option
-        file contents. These include Perl and Python. For details, see
-        the documentation for your preferred interface.
-      </para>
-
-      <para>
         It is possible to use <literal>!include</literal> directives in
         option files to include other option files and
         <literal>!includedir</literal> to search specific directories


Modified: trunk/refman-5.1/programs.xml
===================================================================
--- trunk/refman-5.1/programs.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-5.1/programs.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 4; 432 bytes

@@ -144,10 +144,6 @@
       MySQL installation or upgrading:
     </para>
 
-    <remark role="todo">
-      indicate where these are discussed
-    </remark>
-
     <itemizedlist>
 
       <listitem>


Modified: trunk/refman-6.0/programs-development.xml
===================================================================
--- trunk/refman-6.0/programs-development.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-6.0/programs-development.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 2, Lines Added: 40, Lines Deleted: 4; 2672 bytes

@@ -12,6 +12,41 @@
     developing MySQL programs.
   </para>
 
+  <para>
+    In shell scripts, you can use the
+    <command>my_print_defaults</command> program to parse option files
+    and see what options would be used by a given program. The following
+    example shows the output that <command>my_print_defaults</command>
+    might produce when asked to show the options found in the
+    <literal>[client]</literal> and <literal>[mysql]</literal> groups:
+  </para>
+
+<programlisting>
+shell&gt; <userinput>my_print_defaults client mysql</userinput>
+--port=3306
+--socket=/tmp/mysql.sock
+--no-auto-rehash
+</programlisting>
+
+  <para>
+    <emphasis role="bold">Note for developers</emphasis>: Option file
+    handling is implemented in the C client library simply by processing
+    all options in the appropriate group or groups before any
+    command-line arguments. This works well for programs that use the
+    last instance of an option that is specified multiple times. If you
+    have a C or C++ program that handles multiply specified options this
+    way but that doesn't read option files, you need add only two lines
+    to give it that capability. Check the source code of any of the
+    standard MySQL clients to see how to do this.
+  </para>
+
+  <para>
+    Several other language interfaces to MySQL are based on the C client
+    library, and some of them provide a way to access option file
+    contents. These include Perl and Python. For details, see the
+    documentation for your preferred interface.
+  </para>
+
   <refentry id="msql2mysql">
 
     <indexterm>

@@ -133,10 +168,11 @@
             Compiler flags to find include files and critical compiler
             flags and defines used when compiling the
             <literal>libmysqlclient</literal> library. The options
-            returns are tied to the specific compiler that was used when
-            the library was created and might clash with the settings
-            for your own compiler. Use <option>--include</option> for
-            more portable options that contain only include paths.
+            returned are tied to the specific compiler that was used
+            when the library was created and might clash with the
+            settings for your own compiler. Use
+            <option>--include</option> for more portable options that
+            contain only include paths.
           </para>
         </listitem>
 


Modified: trunk/refman-6.0/programs-using.xml
===================================================================
--- trunk/refman-6.0/programs-using.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-6.0/programs-using.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 41; 2209 bytes

@@ -952,48 +952,7 @@
 new
 </programlisting>
 
-      <remark role="todo">
-        The next few paragraphs probably should go into the API chapter.
-      </remark>
-
       <para>
-        In shell scripts, you can use the
-        <command>my_print_defaults</command> program to parse option
-        files and see what options would be used by a given program. The
-        following example shows the output that
-        <command>my_print_defaults</command> might produce when asked to
-        show the options found in the <literal>[client]</literal> and
-        <literal>[mysql]</literal> groups:
-      </para>
-
-<programlisting>
-shell&gt; <userinput>my_print_defaults client mysql</userinput>
---port=3306
---socket=/tmp/mysql.sock
---no-auto-rehash
-</programlisting>
-
-      <para>
-        <emphasis role="bold">Note for developers</emphasis>: Option
-        file handling is implemented in the C client library simply by
-        processing all options in the appropriate group or groups before
-        any command-line arguments. This works well for programs that
-        use the last instance of an option that is specified multiple
-        times. If you have a C or C++ program that handles multiply
-        specified options this way but that doesn't read option files,
-        you need add only two lines to give it that capability. Check
-        the source code of any of the standard MySQL clients to see how
-        to do this.
-      </para>
-
-      <para>
-        Several other language interfaces to MySQL are based on the C
-        client library, and some of them provide a way to access option
-        file contents. These include Perl and Python. For details, see
-        the documentation for your preferred interface.
-      </para>
-
-      <para>
         It is possible to use <literal>!include</literal> directives in
         option files to include other option files and
         <literal>!includedir</literal> to search specific directories


Modified: trunk/refman-6.0/programs.xml
===================================================================
--- trunk/refman-6.0/programs.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-6.0/programs.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 4; 432 bytes

@@ -144,10 +144,6 @@
       MySQL installation or upgrading:
     </para>
 
-    <remark role="todo">
-      indicate where these are discussed
-    </remark>
-
     <itemizedlist>
 
       <listitem>


Modified: trunk/refman-6.0/unicode-tmp.xml
===================================================================
--- trunk/refman-6.0/unicode-tmp.xml	2007-12-15 10:56:43 UTC (rev 9335)
+++ trunk/refman-6.0/unicode-tmp.xml	2007-12-15 19:00:51 UTC (rev 9336)
Changed blocks: 2, Lines Added: 129, Lines Deleted: 1; 5070 bytes

@@ -959,7 +959,7 @@
 
       <listitem>
         <para>
-          What to do to upgrade
+          Need upgrade instructions.
         </para>
       </listitem>
 

@@ -1042,6 +1042,134 @@
       will get an error message.
     </para>
 
+    <para>
+      <literal>utf8</literal> columns from old tables will appear as
+      <literal>utf8mb3</literal>.
+      <literal>utf8_<replaceable>xxx</replaceable></literal> collations
+      from old tables will appear as
+      <literal>utf8mb3_<replaceable>xxx</replaceable></literal>.
+    </para>
+
+    <para>
+      Show a <literal>SHOW CREATE TABLE</literal> statement for a table
+      that uses <literal>utf8</literal> and a couple of different
+      collations, in 5.1/6.0.
+    </para>
+
+    <para>
+      Suppose that you create a table using this definition in MySQL
+      5.1:
+    </para>
+
+<programlisting>
+CREATE TABLE t (
+  col1 CHAR(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci,
+  col2 CHAR(10) CHARACTER SET utf8 COLLATE utf8_bin
+) CHARACTER SET utf8;
+</programlisting>
+
+    <para>
+      In MySQL 5.1, <literal>SHOW CREATE TABLE</literal> produces this
+      result:
+    </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW CREATE TABLE t\G</userinput>
+*************************** 1. row ***************************
+       Table: t
+Create Table: CREATE TABLE `t` (
+  `col1` char(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL,
+  `col2` char(10) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8
+</programlisting>
+
+    <para>
+      After upgrading to MySQL 6.0, <literal>SHOW CREATE TABLE</literal>
+      produces this result instead:
+    </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW CREATE TABLE t\G</userinput>
+*************************** 1. row ***************************
+       Table: t
+Create Table: CREATE TABLE `t` (
+  `col1` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci NOT NULL,
+  `col2` char(10) CHARACTER SET utf8mb3 COLLATE utf8mb3_bin NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb3
+</programlisting>
+
+    <para>
+      The collation IDs for the old <literal>utf8</literal> character
+      set now belong to <literal>utf8mb3</literal>. The collations IDs
+      for new <literal>utf8</literal> character set are new.
+    </para>
+
+    <para>
+      MySQL 5.1:
+    </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW COLLATION LIKE 'utf8%bin';</userinput>
++-----------+---------+----+---------+----------+---------+
+| Collation | Charset | Id | Default | Compiled | Sortlen |
++-----------+---------+----+---------+----------+---------+
+| utf8_bin  | utf8    | 83 |         | Yes      |       1 | 
++-----------+---------+----+---------+----------+---------+
+1 row in set (0.00 sec)
+</programlisting>
+
+    <para>
+      MySQL 6.0:
+    </para>
+
+<programlisting>
+mysql&gt; <userinput>SHOW COLLATION LIKE 'utf8%bin';</userinput>
++-------------+---------+----+---------+----------+---------+
+| Collation   | Charset | Id | Default | Compiled | Sortlen |
++-------------+---------+----+---------+----------+---------+
+| utf8mb3_bin | utf8mb3 | 83 |         | Yes      |       1 | 
+| utf8_bin    | utf8    | 46 |         | Yes      |       1 | 
++-------------+---------+----+---------+----------+---------+
+2 rows in set (0.01 sec)
+</programlisting>
+
+    <para>
+      Applications that used the old IDs to detect
+      <literal>utf8</literal> will need to be updated unless they are
+      okay with these IDs meaning <literal>utf8mb3</literal> now.
+    </para>
+
+    <para>
+      Performance of 4-byte UTF-8 (<literal>utf8</literal>) is slower
+      than for 3-byte UTF-8 (<literal>utf8mb3</literal>). There are
+      tradeoffs: If you want the same character set and collation names,
+      you can use <literal>ALTER TABLE</literal> to convert from
+      <literal>utf8mb3</literal> to <literal>utf8</literal>. But that
+      will introduce a small performance penalty. If you do not want to
+      incur this penalty, continue to use <literal>utf8mb3</literal>.
+    </para>
+
+    <para>
+      <literal>SET NAMES 'utf8'</literal> now causes use of 4-byte
+      character set. As long as no 4-byte character are sent in either
+      direction, there should be no problems. Otherwise, applications
+      that expect to receive a maximum of three bytes per character may
+      have problems. Conversely, applications that expect to send 4-byte
+      characters must ensure that the server understands them.
+    </para>
+
+    <para>
+      <literal>SET NAMES 'utf8'</literal> sent to a pre-6.0 server.
+      Applications may have to detect that the server is not 4-byte
+      aware. [Not a problem as long as no 4-byte characters are sent or
+      received]
+    </para>
+
+    <para>
+      Replication: If 4-byte characters are going to be used, all
+      servers involved must understand them.
+    </para>
+
   </section>
 
 </section>


Thread
svn commit - mysqldoc@docsrva: r9336 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0paul15 Dec