List:Commits« Previous MessageNext Message »
From:paul Date:January 29 2006 2:19pm
Subject:svn commit - mysqldoc@docsrva: r1104 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-29 15:19:31 +0100 (Sun, 29 Jan 2006)
New Revision: 1104

Log:
 r6858@frost:  paul | 2006-01-29 08:16:26 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.1/database-administration.xml


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

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-29 14:17:35 UTC (rev 1103)
+++ trunk/refman-4.1/database-administration.xml	2006-01-29 14:19:31 UTC (rev 1104)
@@ -18036,7 +18036,7 @@
 Total:    Keyblocks used:   9%  Packed:   17%
 
 - check records and index references
-[LOTS OF ROW NUMBERS DELETED]
+<replaceable>*** LOTS OF ROW NUMBERS DELETED ***</replaceable>
 
 Records:         1403698   M.recordlength:   226   Packed:           0%
 Recordspace used:    100%  Empty space:        0%  Blocks/Record: 1.00
@@ -18119,7 +18119,7 @@
             <para>
               How many deleted blocks still have reserved space. You can
               optimize your table to minimize this space. See
-              <xref linkend="optimization"/>.
+              <xref linkend="table-optimization"/>.
             </para>
           </listitem>
 
@@ -18144,7 +18144,7 @@
             <para>
               How many bytes of unreclaimed deleted data there are. You
               can optimize your table to minimize this space. See
-              <xref linkend="optimization"/>.
+              <xref linkend="table-optimization"/>.
             </para>
           </listitem>
 
@@ -18320,11 +18320,11 @@
 
                 <para>
                   This is a statistical value used by the optimizer. It
-                  tells how many rows there are per value for this key.
-                  A unique key always has a value of 1. This may be
-                  updated after a table is loaded (or greatly changed)
-                  with <command>myisamchk -a</command>. If this is not
-                  updated at all, a default value of 30 is given.
+                  tells how many rows there are per value for this
+                  index. A unique index always has a value of 1. This
+                  may be updated after a table is loaded (or greatly
+                  changed) with <command>myisamchk -a</command>. If this
+                  is not updated at all, a default value of 30 is given.
                 </para>
               </listitem>
 
@@ -18358,13 +18358,14 @@
             </para>
 
             <para>
-              MySQL tries to pack keys with a common suffix. This can
-              only be used for indexes on <literal>CHAR</literal>,
-              <literal>VARCHAR</literal> columns. For long indexed
-              strings that have similar leftmost parts, this can
-              significantly reduce the space used. In the third example
-              above, the fourth key is 10 characters long and a 60%
-              reduction in space is achieved.
+              MySQL tries to pack key values that have a common suffix.
+              This can only be used for indexes on
+              <literal>CHAR</literal> and <literal>VARCHAR</literal>
+              columns. For long indexed strings that have similar
+              leftmost parts, this can significantly reduce the space
+              used. In the third of the preceding examples, the fourth
+              key is 10 characters long and a 60% reduction in space is
+              achieved.
             </para>
           </listitem>
 
@@ -18443,7 +18444,7 @@
               a fragmented row is composed of). This is always 1.0 for
               fixed-format tables. This value should stay as close to
               1.0 as possible. If it gets too large, you can reorganize
-              the table. See <xref linkend="optimization"/>.
+              the table. See <xref linkend="table-optimization"/>.
             </para>
           </listitem>
 
@@ -18585,9 +18586,27 @@
         </para>
 
         <para>
-          An even better test would be to check any table that has a
-          last-modified time more recent than that of the
-          <filename>.pid</filename> file.
+          It is also a good idea to enable automatic
+          <literal>MyISAM</literal> table checking. For example,
+          whenever the machine has done a restart in the middle of an
+          update, you usually need to check each table that could have
+          been affected before it is used further. (These are
+          <quote>expected crashed tables.</quote>) To check
+          <literal>MyISAM</literal> tables automatically, start the
+          server with the <option>--myisam-recover</option> option,
+          available as of MySQL 3.23.25. See
+          <xref linkend="server-options"/>. If your server is too old to
+          support this option, you could add a test to
+          <command>mysqld_safe</command> that runs
+          <command>myisamchk</command> to check all tables that have
+          been modified during the last 24 hours if there is an old
+          <filename>.pid</filename> (process ID) file left after a
+          restart. (The <filename>.pid</filename> file is created by
+          <command>mysqld</command> when it starts and removed when it
+          terminates normally. The presence of a
+          <filename>.pid</filename> file at system startup time
+          indicates that <command>mysqld</command> terminated
+          abnormally.)
         </para>
 
         <para>
@@ -18628,22 +18647,18 @@
 
         <para>
           Normally, MySQL tables need little maintenance. If you are
-          changing <literal>MyISAM</literal> tables with dynamic-sized
-          rows (tables with <literal>VARCHAR</literal>,
-          <literal>BLOB</literal>, or <literal>TEXT</literal> columns)
-          or have tables with many deleted rows you may want to
-          defragment/reclaim space from the tables from time to time
-          (once a month?).
+          performing many updates to <literal>MyISAM</literal> tables
+          with dynamic-sized rows (tables with
+          <literal>VARCHAR</literal>, <literal>BLOB</literal>, or
+          <literal>TEXT</literal> columns) or have tables with many
+          deleted rows you may want to defragment/reclaim space from the
+          tables from time to time. You can do this by using
+          <literal>OPTIMIZE TABLE</literal> on the tables in question.
+          Alternatively, if you can stop the <command>mysqld</command>
+          server for a while, change location into the data directory
+          and use this command while the server is stopped:
         </para>
 
-        <para>
-          You can do this by using <literal>OPTIMIZE TABLE</literal> on
-          the tables in question. Or, if you can stop the
-          <command>mysqld</command> server for a while, change location
-          into the data directory and use this command while the server
-          is stopped:
-        </para>
-
 <programlisting>
 shell&gt; <userinput>myisamchk -r -s --sort-index --sort_buffer_size=16M */*.MYI</userinput>
 </programlisting>
@@ -18692,9 +18707,10 @@
 
       <para>
         By default, MySQL uses the <literal>latin1</literal> (cp1252
-        West European) character set with sorting according to
-        Swedish/Finnish rules. These defaults are suitable for the
-        United States and most of Western Europe.
+        West European) character set and the
+        <literal>latin1_swedish_ci</literal> collation that sorts
+        according to Swedish/Finnish rules. These defaults are suitable
+        for the United States and most of Western Europe.
       </para>
 
       <para>
@@ -18708,32 +18724,33 @@
 
       <para>
         The character set determines what characters are allowed in
-        names. It also determines how strings are sorted by the
-        <literal>ORDER BY</literal> and <literal>GROUP BY</literal>
+        identifiers. The collation determines how strings are sorted by
+        the <literal>ORDER BY</literal> and <literal>GROUP BY</literal>
         clauses of the <literal>SELECT</literal> statement.
       </para>
 
       <para>
-        You can change the character set with the
-        <option>--character-set-server</option> option when you start
-        the server (<option>--default-character-set</option> before
-        MySQL 4.1.3). The character sets available depend on the
-        <option>--with-charset=<replaceable>charset_name</replaceable></option>
-        and <option>--with-extra-charsets=
-        <replaceable>list-of-charsets</replaceable> | complex | all |
-        none</option> options to <command>configure</command>, and the
-        character set configuration files listed in
-        <filename>SHAREDIR/charsets/Index</filename>. See
-        <xref linkend="configure-options"/>.
+        You can change the default server character set and collation
+        with the <option>--character-set-server</option> and
+        <option>--collation-server</option> options when you start the
+        server. The collation must be a legal collation for the default
+        character set. (Use the <literal>SHOW COLLATION</literal>
+        statement to determine which collations are available for each
+        character set.) See <xref linkend="server-options"/>. Before
+        MySQL 4.1.3, use <option>--default-character-set</option> to
+        change the character set; there is no option for changing the
+        collation.
       </para>
 
       <para>
-        As of MySQL 4.1.3, you can also change the character set
-        collation with the <option>--collation-server</option> option
-        when you start the server. The collation must be a legal
-        collation for the default character set. (Use the <literal>SHOW
-        COLLATION</literal> statement to determine which collations are
-        available for each character set.) See
+        The character sets available depend on the
+        <option>--with-charset=<replaceable>charset_name</replaceable></option>
+        and
+        <option>--with-extra-charsets=<replaceable>list-of-charsets</replaceable>
+        | complex | all | none</option> options to
+        <command>configure</command>, and the character set
+        configuration files listed in
+        <filename>SHAREDIR/charsets/Index</filename>. See
         <xref linkend="configure-options"/>.
       </para>
 
@@ -18924,17 +18941,17 @@
       </para>
 
       <para>
-        The language files are located (by default) in the
+        By default, the language files are located in the
         <filename>share/<replaceable>LANGUAGE</replaceable></filename>
         directory under the MySQL base directory.
       </para>
 
       <para>
-        You can also change the error messages produced by the server.
-        Details can be found in the MySQL Internals manual, available at
-        <ulink url="&base-url-docs;"/>. If you upgrade to a newer
-        version of MySQL after changing the error messages, remember to
-        repeat your changes after the upgrade.
+        You can also change the content of the error messages produced
+        by the server. Details can be found in the MySQL Internals
+        manual, available at <ulink url="&base-url-docs;"/>. If you
+        upgrade to a newer version of MySQL after changing the error
+        messages, remember to repeat your changes after the upgrade.
       </para>
 
     </section>
@@ -18956,14 +18973,10 @@
       <para>
         This section discusses the procedure for adding a new character
         set to MySQL. You must have a MySQL source distribution to use
-        these instructions.
+        these instructions. To choose the proper procedure, determine
+        whether the character set is simple or complex:
       </para>
 
-      <para>
-        To choose the proper procedure, decide whether the character set
-        is simple or complex:
-      </para>
-
       <itemizedlist>
 
         <listitem>
@@ -18990,7 +19003,7 @@
       </para>
 
       <para>
-        In the following procedures, the name of the character set is
+        In the following instructions, the name of the character set is
         represented by <replaceable>MYSET</replaceable>.
       </para>
 
@@ -19370,8 +19383,8 @@
 
         <listitem>
           <para>
-            Your program has an incorrect path to where the character
-            sets are stored. (Default
+            Your program uses an incorrect path to determine where the
+            character sets are stored. (Default
             <filename>/usr/local/mysql/share/mysql/charsets</filename>).
             This can be fixed by using the
             <option>--character-sets-dir</option> option when you run

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-29 14:17:35 UTC (rev 1103)
+++ trunk/refman-5.0/database-administration.xml	2006-01-29 14:19:31 UTC (rev 1104)
@@ -20269,7 +20269,7 @@
 Total:    Keyblocks used:   9%  Packed:   17%
 
 - check records and index references
-[LOTS OF ROW NUMBERS DELETED]
+<replaceable>*** LOTS OF ROW NUMBERS DELETED ***</replaceable>
 
 Records:         1403698   M.recordlength:   226   Packed:           0%
 Recordspace used:    100%  Empty space:        0%  Blocks/Record: 1.00
@@ -20352,7 +20352,7 @@
             <para>
               How many deleted blocks still have reserved space. You can
               optimize your table to minimize this space. See
-              <xref linkend="optimization"/>.
+              <xref linkend="table-optimization"/>.
             </para>
           </listitem>
 
@@ -20377,7 +20377,7 @@
             <para>
               How many bytes of unreclaimed deleted data there are. You
               can optimize your table to minimize this space. See
-              <xref linkend="optimization"/>.
+              <xref linkend="table-optimization"/>.
             </para>
           </listitem>
 
@@ -20553,11 +20553,11 @@
 
                 <para>
                   This is a statistical value used by the optimizer. It
-                  tells how many rows there are per value for this key.
-                  A unique key always has a value of 1. This may be
-                  updated after a table is loaded (or greatly changed)
-                  with <command>myisamchk -a</command>. If this is not
-                  updated at all, a default value of 30 is given.
+                  tells how many rows there are per value for this
+                  index. A unique index always has a value of 1. This
+                  may be updated after a table is loaded (or greatly
+                  changed) with <command>myisamchk -a</command>. If this
+                  is not updated at all, a default value of 30 is given.
                 </para>
               </listitem>
 
@@ -20591,13 +20591,14 @@
             </para>
 
             <para>
-              MySQL tries to pack keys with a common suffix. This can
-              only be used for indexes on <literal>CHAR</literal>,
-              <literal>VARCHAR</literal> columns. For long indexed
-              strings that have similar leftmost parts, this can
-              significantly reduce the space used. In the third example
-              above, the fourth key is 10 characters long and a 60%
-              reduction in space is achieved.
+              MySQL tries to pack key values that have a common suffix.
+              This can only be used for indexes on
+              <literal>CHAR</literal> and <literal>VARCHAR</literal>
+              columns. For long indexed strings that have similar
+              leftmost parts, this can significantly reduce the space
+              used. In the third of the preceding examples, the fourth
+              key is 10 characters long and a 60% reduction in space is
+              achieved.
             </para>
           </listitem>
 
@@ -20680,7 +20681,7 @@
               a fragmented row is composed of). This is always 1.0 for
               fixed-format tables. This value should stay as close to
               1.0 as possible. If it gets too large, you can reorganize
-              the table. See <xref linkend="optimization"/>.
+              the table. See <xref linkend="table-optimization"/>.
             </para>
           </listitem>
 
@@ -20799,22 +20800,18 @@
         </indexterm>
 
         <para>
-          It is also a good idea to check tables when the server starts.
-          For example, whenever the machine has done a restart in the
-          middle of an update, you usually need to check all the tables
-          that could have been affected. (These are <quote>expected
-          crashed tables.</quote>) To check <literal>MyISAM</literal>
-          tables automatically, start the server with the
-          <option>--myisam-recover</option> option.
+          It is also a good idea to enable automatic
+          <literal>MyISAM</literal> table checking. For example,
+          whenever the machine has done a restart in the middle of an
+          update, you usually need to check each table that could have
+          been affected before it is used further. (These are
+          <quote>expected crashed tables.</quote>) To check
+          <literal>MyISAM</literal> tables automatically, start the
+          server with the <option>--myisam-recover</option> option. See
+          <xref linkend="server-options"/>.
         </para>
 
         <para>
-          An even better test would be to check any table that has a
-          last-modified time more recent than that of the
-          <filename>.pid</filename> file.
-        </para>
-
-        <para>
           You should also check your tables regularly during normal
           system operation. At MySQL AB, we run a
           <command>cron</command> job to check all our important tables
@@ -20852,22 +20849,18 @@
 
         <para>
           Normally, MySQL tables need little maintenance. If you are
-          changing <literal>MyISAM</literal> tables with dynamic-sized
-          rows (tables with <literal>VARCHAR</literal>,
-          <literal>BLOB</literal>, or <literal>TEXT</literal> columns)
-          or have tables with many deleted rows you may want to
-          defragment/reclaim space from the tables from time to time
-          (once a month?).
+          performing many updates to <literal>MyISAM</literal> tables
+          with dynamic-sized rows (tables with
+          <literal>VARCHAR</literal>, <literal>BLOB</literal>, or
+          <literal>TEXT</literal> columns) or have tables with many
+          deleted rows you may want to defragment/reclaim space from the
+          tables from time to time. You can do this by using
+          <literal>OPTIMIZE TABLE</literal> on the tables in question.
+          Alternatively, if you can stop the <command>mysqld</command>
+          server for a while, change location into the data directory
+          and use this command while the server is stopped:
         </para>
 
-        <para>
-          You can do this by using <literal>OPTIMIZE TABLE</literal> on
-          the tables in question. Or, if you can stop the
-          <command>mysqld</command> server for a while, change location
-          into the data directory and use this command while the server
-          is stopped:
-        </para>
-
 <programlisting>
 shell&gt; <userinput>myisamchk -r -s --sort-index --sort_buffer_size=16M */*.MYI</userinput>
 </programlisting>
@@ -20908,9 +20901,10 @@
 
       <para>
         By default, MySQL uses the <literal>latin1</literal> (cp1252
-        West European) character set with sorting according to
-        Swedish/Finnish rules. These defaults are suitable for the
-        United States and most of Western Europe.
+        West European) character set and the
+        <literal>latin1_swedish_ci</literal> collation that sorts
+        according to Swedish/Finnish rules. These defaults are suitable
+        for the United States and most of Western Europe.
       </para>
 
       <para>
@@ -20924,35 +20918,34 @@
 
       <para>
         The character set determines what characters are allowed in
-        names. It also determines how strings are sorted by the
-        <literal>ORDER BY</literal> and <literal>GROUP BY</literal>
+        identifiers. The collation determines how strings are sorted by
+        the <literal>ORDER BY</literal> and <literal>GROUP BY</literal>
         clauses of the <literal>SELECT</literal> statement.
       </para>
 
       <para>
-        You can change the character set with the
-        <option>--character-set-server</option> option when you start
-        the server. The character sets available depend on the
+        You can change the default server character set and collation
+        with the <option>--character-set-server</option> and
+        <option>--collation-server</option> options when you start the
+        server. The collation must be a legal collation for the default
+        character set. (Use the <literal>SHOW COLLATION</literal>
+        statement to determine which collations are available for each
+        character set.) See <xref linkend="server-options"/>.
+      </para>
+
+      <para>
+        The character sets available depend on the
         <option>--with-charset=<replaceable>charset_name</replaceable></option>
         and
         <option>--with-extra-charsets=<replaceable>list-of-charsets</replaceable>
         | complex | all | none</option> options to
         <command>configure</command>, and the character set
         configuration files listed in
-        <filename>SHAREDIR/charsets/Index</filename>. See
-        <xref linkend="configure-options"/>.
+        <filename><replaceable>SHAREDIR</replaceable>/charsets/Index</filename>.
+        See <xref linkend="configure-options"/>.
       </para>
 
       <para>
-        You can also change the character set collation with the
-        <option>--collation-server</option> option when you start the
-        server. The collation must be a legal collation for the default
-        character set. (Use the <literal>SHOW COLLATION</literal>
-        statement to determine which collations are available for each
-        character set.) See <xref linkend="configure-options"/>.
-      </para>
-
-      <para>
         If you change the character set when running MySQL, that may
         also change the sort order. Consequently, you must run
         <command>myisamchk -r -q
@@ -21094,17 +21087,17 @@
       </para>
 
       <para>
-        The language files are located (by default) in the
+        By default, the language files are located in the
         <filename>share/<replaceable>LANGUAGE</replaceable></filename>
         directory under the MySQL base directory.
       </para>
 
       <para>
-        You can also change the error messages produced by the server.
-        Details can be found in the MySQL Internals manual, available at
-        <ulink url="&base-url-docs;"/>. If you upgrade to a newer
-        version of MySQL after changing the error messages, remember to
-        repeat your changes after the upgrade.
+        You can also change the content of the error messages produced
+        by the server. Details can be found in the MySQL Internals
+        manual, available at <ulink url="&base-url-docs;"/>. If you
+        upgrade to a newer version of MySQL after changing the error
+        messages, remember to repeat your changes after the upgrade.
       </para>
 
     </section>
@@ -21126,14 +21119,10 @@
       <para>
         This section discusses the procedure for adding a new character
         set to MySQL. You must have a MySQL source distribution to use
-        these instructions.
+        these instructions. To choose the proper procedure, determine
+        whether the character set is simple or complex:
       </para>
 
-      <para>
-        To choose the proper procedure, decide whether the character set
-        is simple or complex:
-      </para>
-
       <itemizedlist>
 
         <listitem>
@@ -21160,7 +21149,7 @@
       </para>
 
       <para>
-        In the following procedures, the name of the character set is
+        In the following instructions, the name of the character set is
         represented by <replaceable>MYSET</replaceable>.
       </para>
 
@@ -21540,8 +21529,8 @@
 
         <listitem>
           <para>
-            Your program has an incorrect path to where the character
-            sets are stored. (Default
+            Your program uses an incorrect path to determine where the
+            character sets are stored. (Default
             <filename>/usr/local/mysql/share/mysql/charsets</filename>).
             This can be fixed by using the
             <option>--character-sets-dir</option> option when you run

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-29 14:17:35 UTC (rev 1103)
+++ trunk/refman-5.1/database-administration.xml	2006-01-29 14:19:31 UTC (rev 1104)
@@ -20278,7 +20278,7 @@
 Total:    Keyblocks used:   9%  Packed:   17%
 
 - check records and index references
-[LOTS OF ROW NUMBERS DELETED]
+<replaceable>*** LOTS OF ROW NUMBERS DELETED ***</replaceable>
 
 Records:         1403698   M.recordlength:   226   Packed:           0%
 Recordspace used:    100%  Empty space:        0%  Blocks/Record: 1.00
@@ -20361,7 +20361,7 @@
             <para>
               How many deleted blocks still have reserved space. You can
               optimize your table to minimize this space. See
-              <xref linkend="optimization"/>.
+              <xref linkend="table-optimization"/>.
             </para>
           </listitem>
 
@@ -20386,7 +20386,7 @@
             <para>
               How many bytes of unreclaimed deleted data there are. You
               can optimize your table to minimize this space. See
-              <xref linkend="optimization"/>.
+              <xref linkend="table-optimization"/>.
             </para>
           </listitem>
 
@@ -20562,11 +20562,11 @@
 
                 <para>
                   This is a statistical value used by the optimizer. It
-                  tells how many rows there are per value for this key.
-                  A unique key always has a value of 1. This may be
-                  updated after a table is loaded (or greatly changed)
-                  with <command>myisamchk -a</command>. If this is not
-                  updated at all, a default value of 30 is given.
+                  tells how many rows there are per value for this
+                  index. A unique index always has a value of 1. This
+                  may be updated after a table is loaded (or greatly
+                  changed) with <command>myisamchk -a</command>. If this
+                  is not updated at all, a default value of 30 is given.
                 </para>
               </listitem>
 
@@ -20600,13 +20600,14 @@
             </para>
 
             <para>
-              MySQL tries to pack keys with a common suffix. This can
-              only be used for indexes on <literal>CHAR</literal>,
-              <literal>VARCHAR</literal> columns. For long indexed
-              strings that have similar leftmost parts, this can
-              significantly reduce the space used. In the third example
-              above, the fourth key is 10 characters long and a 60%
-              reduction in space is achieved.
+              MySQL tries to pack key values that have a common suffix.
+              This can only be used for indexes on
+              <literal>CHAR</literal> and <literal>VARCHAR</literal>
+              columns. For long indexed strings that have similar
+              leftmost parts, this can significantly reduce the space
+              used. In the third of the preceding examples, the fourth
+              key is 10 characters long and a 60% reduction in space is
+              achieved.
             </para>
           </listitem>
 
@@ -20689,7 +20690,7 @@
               a fragmented row is composed of). This is always 1.0 for
               fixed-format tables. This value should stay as close to
               1.0 as possible. If it gets too large, you can reorganize
-              the table. See <xref linkend="optimization"/>.
+              the table. See <xref linkend="table-optimization"/>.
             </para>
           </listitem>
 
@@ -20808,22 +20809,18 @@
         </indexterm>
 
         <para>
-          It is also a good idea to check tables when the server starts.
-          For example, whenever the machine has done a restart in the
-          middle of an update, you usually need to check all the tables
-          that could have been affected. (These are <quote>expected
-          crashed tables.</quote>) To check <literal>MyISAM</literal>
-          tables automatically, start the server with the
-          <option>--myisam-recover</option> option.
+          It is also a good idea to enable automatic
+          <literal>MyISAM</literal> table checking. For example,
+          whenever the machine has done a restart in the middle of an
+          update, you usually need to check each table that could have
+          been affected before it is used further. (These are
+          <quote>expected crashed tables.</quote>) To check
+          <literal>MyISAM</literal> tables automatically, start the
+          server with the <option>--myisam-recover</option> option. See
+          <xref linkend="server-options"/>.
         </para>
 
         <para>
-          An even better test would be to check any table that has a
-          last-modified time more recent than that of the
-          <filename>.pid</filename> file.
-        </para>
-
-        <para>
           You should also check your tables regularly during normal
           system operation. At MySQL AB, we run a
           <command>cron</command> job to check all our important tables
@@ -20861,22 +20858,18 @@
 
         <para>
           Normally, MySQL tables need little maintenance. If you are
-          changing <literal>MyISAM</literal> tables with dynamic-sized
-          rows (tables with <literal>VARCHAR</literal>,
-          <literal>BLOB</literal>, or <literal>TEXT</literal> columns)
-          or have tables with many deleted rows you may want to
-          defragment/reclaim space from the tables from time to time
-          (once a month?).
+          performing many updates to <literal>MyISAM</literal> tables
+          with dynamic-sized rows (tables with
+          <literal>VARCHAR</literal>, <literal>BLOB</literal>, or
+          <literal>TEXT</literal> columns) or have tables with many
+          deleted rows you may want to defragment/reclaim space from the
+          tables from time to time. You can do this by using
+          <literal>OPTIMIZE TABLE</literal> on the tables in question.
+          Alternatively, if you can stop the <command>mysqld</command>
+          server for a while, change location into the data directory
+          and use this command while the server is stopped:
         </para>
 
-        <para>
-          You can do this by using <literal>OPTIMIZE TABLE</literal> on
-          the tables in question. Or, if you can stop the
-          <command>mysqld</command> server for a while, change location
-          into the data directory and use this command while the server
-          is stopped:
-        </para>
-
 <programlisting>
 shell&gt; <userinput>myisamchk -r -s --sort-index --sort_buffer_size=16M */*.MYI</userinput>
 </programlisting>
@@ -20917,9 +20910,10 @@
 
       <para>
         By default, MySQL uses the <literal>latin1</literal> (cp1252
-        West European) character set with sorting according to
-        Swedish/Finnish rules. These defaults are suitable for the
-        United States and most of Western Europe.
+        West European) character set and the
+        <literal>latin1_swedish_ci</literal> collation that sorts
+        according to Swedish/Finnish rules. These defaults are suitable
+        for the United States and most of Western Europe.
       </para>
 
       <para>
@@ -20933,35 +20927,34 @@
 
       <para>
         The character set determines what characters are allowed in
-        names. It also determines how strings are sorted by the
-        <literal>ORDER BY</literal> and <literal>GROUP BY</literal>
+        identifiers. The collation determines how strings are sorted by
+        the <literal>ORDER BY</literal> and <literal>GROUP BY</literal>
         clauses of the <literal>SELECT</literal> statement.
       </para>
 
       <para>
-        You can change the character set with the
-        <option>--character-set-server</option> option when you start
-        the server. The character sets available depend on the
+        You can change the default server character set and collation
+        with the <option>--character-set-server</option> and
+        <option>--collation-server</option> options when you start the
+        server. The collation must be a legal collation for the default
+        character set. (Use the <literal>SHOW COLLATION</literal>
+        statement to determine which collations are available for each
+        character set.) See <xref linkend="server-options"/>.
+      </para>
+
+      <para>
+        The character sets available depend on the
         <option>--with-charset=<replaceable>charset_name</replaceable></option>
         and
         <option>--with-extra-charsets=<replaceable>list-of-charsets</replaceable>
         | complex | all | none</option> options to
         <command>configure</command>, and the character set
         configuration files listed in
-        <filename>SHAREDIR/charsets/Index</filename>. See
-        <xref linkend="configure-options"/>.
+        <filename><replaceable>SHAREDIR</replaceable>/charsets/Index</filename>.
+        See <xref linkend="configure-options"/>.
       </para>
 
       <para>
-        You can also change the character set collation with the
-        <option>--collation-server</option> option when you start the
-        server. The collation must be a legal collation for the default
-        character set. (Use the <literal>SHOW COLLATION</literal>
-        statement to determine which collations are available for each
-        character set.) See <xref linkend="configure-options"/>.
-      </para>
-
-      <para>
         If you change the character set when running MySQL, that may
         also change the sort order. Consequently, you must run
         <command>myisamchk -r -q
@@ -21103,17 +21096,17 @@
       </para>
 
       <para>
-        The language files are located (by default) in the
+        By default, the language files are located in the
         <filename>share/<replaceable>LANGUAGE</replaceable></filename>
         directory under the MySQL base directory.
       </para>
 
       <para>
-        You can also change the error messages produced by the server.
-        Details can be found in the MySQL Internals manual, available at
-        <ulink url="&base-url-docs;"/>. If you upgrade to a newer
-        version of MySQL after changing the error messages, remember to
-        repeat your changes after the upgrade.
+        You can also change the content of the error messages produced
+        by the server. Details can be found in the MySQL Internals
+        manual, available at <ulink url="&base-url-docs;"/>. If you
+        upgrade to a newer version of MySQL after changing the error
+        messages, remember to repeat your changes after the upgrade.
       </para>
 
     </section>
@@ -21135,14 +21128,10 @@
       <para>
         This section discusses the procedure for adding a new character
         set to MySQL. You must have a MySQL source distribution to use
-        these instructions.
+        these instructions. To choose the proper procedure, determine
+        whether the character set is simple or complex:
       </para>
 
-      <para>
-        To choose the proper procedure, decide whether the character set
-        is simple or complex:
-      </para>
-
       <itemizedlist>
 
         <listitem>
@@ -21169,7 +21158,7 @@
       </para>
 
       <para>
-        In the following procedures, the name of the character set is
+        In the following instructions, the name of the character set is
         represented by <replaceable>MYSET</replaceable>.
       </para>
 
@@ -21549,8 +21538,8 @@
 
         <listitem>
           <para>
-            Your program has an incorrect path to where the character
-            sets are stored. (Default
+            Your program uses an incorrect path to determine where the
+            character sets are stored. (Default
             <filename>/usr/local/mysql/share/mysql/charsets</filename>).
             This can be fixed by using the
             <option>--character-sets-dir</option> option when you run

Thread
svn commit - mysqldoc@docsrva: r1104 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul29 Jan