List:Commits« Previous MessageNext Message »
From:paul Date:January 27 2006 11:52pm
Subject:svn commit - mysqldoc@docsrva: r1072 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-28 00:52:05 +0100 (Sat, 28 Jan 2006)
New Revision: 1072

Log:
 r6794@frost:  paul | 2006-01-27 17:51:49 -0600
 General revisions.


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


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

Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml	2006-01-27 23:06:29 UTC (rev 1071)
+++ trunk/refman-4.1/charset.xml	2006-01-27 23:52:05 UTC (rev 1072)
@@ -1995,8 +1995,8 @@
       </itemizedlist>
 
       <para>
-        For example, with <literal>CASE &hellip; WHEN a THEN b WHEN b
-        THEN c COLLATE <replaceable>X</replaceable> END</literal>, the
+        For example, with <literal>CASE ... WHEN a THEN b WHEN b THEN c
+        COLLATE <replaceable>X</replaceable> END</literal>, the
         resulting collation is <replaceable>X</replaceable>. The same
         applies for <literal>CASE</literal>, <literal>UNION</literal>,
         <literal>||</literal>, <literal>CONCAT()</literal>,
@@ -2045,8 +2045,8 @@
 </programlisting>
 
       <para>
-        <literal>CONVERT(&hellip; USING &hellip;)</literal> is
-        implemented according to the standard SQL specification.
+        <literal>CONVERT(... USING ...)</literal> is implemented
+        according to the standard SQL specification.
       </para>
 
       <para>
@@ -2081,8 +2081,8 @@
       <para>
         You may not use a <literal>COLLATE</literal> clause inside a
         <literal>CAST()</literal>, but you may use it outside. That is,
-        <literal>CAST(&hellip; COLLATE &hellip;)</literal> is illegal,
-        but <literal>CAST(&hellip;) COLLATE &hellip;</literal> is legal.
+        <literal>CAST(... COLLATE ...)</literal> is illegal, but
+        <literal>CAST(...) COLLATE ...</literal> is legal.
       </para>
 
       <para>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-27 23:06:29 UTC (rev 1071)
+++ trunk/refman-4.1/database-administration.xml	2006-01-27 23:52:05 UTC (rev 1072)
@@ -713,7 +713,7 @@
 
           <listitem>
             <para>
-              <option>--default-time-zone=<replaceable>zone</replaceable></option>
+              <option>--default-time-zone=<replaceable>timezone</replaceable></option>
             </para>
 
             <para>
@@ -1436,11 +1436,11 @@
             </para>
 
             <para>
-              If this is enabled, a user cannot create new users with
-              the <literal>GRANT</literal> statement, if the user does
-              not have the <literal>INSERT</literal> privilege for the
-              <literal>mysql.user</literal> table or any column in the
-              table.
+              If this is enabled, a user can't create new users by using
+              the <literal>GRANT</literal> statement, if the user
+              doesn't have the <literal>INSERT</literal> privilege for
+              the <literal>mysql.user</literal> table or any column in
+              the table.
             </para>
           </listitem>
 
@@ -4063,8 +4063,9 @@
             </para>
 
             <para>
-              After this many write locks, allow some read locks to run
-              in between. This variable was added in MySQL 3.23.7.
+              After this many write locks, allow some pending read lock
+              requests to be processed in between. This variable was
+              added in MySQL 3.23.7.
             </para>
           </listitem>
 
@@ -4112,7 +4113,7 @@
               use while re-creating a <literal>MyISAM</literal> index
               (during <literal>REPAIR TABLE</literal>, <literal>ALTER
               TABLE</literal>, or <literal>LOAD DATA INFILE</literal>).
-              If the file size would be bigger than this value, the
+              If the file size would be larger than this value, the
               index is created using the key cache instead, which is
               slower. This variable was added in MySQL 3.23.37.
               <emphasis role="bold">Note</emphasis>: The value is given
@@ -4127,7 +4128,8 @@
 
             <para>
               The value of the <option>--myisam-recover</option> option.
-              This variable was added in MySQL 3.23.36.
+              See <xref linkend="server-options"/>. This variable was
+              added in MySQL 3.23.36.
             </para>
           </listitem>
 
@@ -4153,7 +4155,7 @@
             </para>
 
             <para>
-              The buffer that is allocated when sorting
+              The size of the buffer that is allocated when sorting
               <literal>MyISAM</literal> indexes during a <literal>REPAIR
               TABLE</literal> or when creating indexes with
               <literal>CREATE INDEX</literal> or <literal>ALTER
@@ -4215,8 +4217,8 @@
 
             <para>
               The communication buffer is reset to this size between SQL
-              statements. This should not normally be changed, but if
-              you have very little memory, you can set it to the
+              statements. This variable should not normally be changed,
+              but if you have very little memory, you can set it to the
               expected length of statements sent by clients. If
               statements exceed this length, the buffer is automatically
               enlarged, up to <literal>max_allowed_packet</literal>
@@ -4231,8 +4233,10 @@
 
             <para>
               The number of seconds to wait for more data from a
-              connection before aborting the read. When the server is
-              reading from the client,
+              connection before aborting the read. This timeout applies
+              only to TCP/IP connections, not to connections made via
+              Unix socket files, named pipes, or shared memory. When the
+              server is reading from the client,
               <literal>net_read_timeout</literal> is the timeout value
               controlling when to abort. When the server is writing to
               the client, <literal>net_write_timeout</literal> is the
@@ -4262,9 +4266,11 @@
 
             <para>
               The number of seconds to wait for a block to be written to
-              a connection before aborting the write. See also
-              <literal>net_read_timeout</literal>. This variable was
-              added in MySQL 3.23.20.
+              a connection before aborting the write. This timeout
+              applies only to TCP/IP connections, not to connections
+              made via Unix socket files, named pipes, or shared memory.
+              See also <literal>net_read_timeout</literal>. This
+              variable was added in MySQL 3.23.20.
             </para>
           </listitem>
 
@@ -4298,25 +4304,13 @@
 
             <para>
               This is not a variable, but it can be used when setting
-              some variables. It's described in
+              some variables. It is described in
               <xref linkend="set-option"/>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>one_shot</literal>
-            </para>
-
-            <para>
-              This is not a variable, but it can be used when setting
-              some variables. It's described in
-              <xref linkend="set-option"/>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <literal>open_files_limit</literal>
             </para>
 
@@ -4324,10 +4318,12 @@
               The number of files that the operating system allows
               <command>mysqld</command> to open. This is the real value
               allowed by the system and might be different from the
-              value you gave <command>mysqld</command> as a startup
-              option. The value is 0 on systems where MySQL cannot
-              change the number of open files. This variable was added
-              in MySQL 3.23.20.
+              value you gave using the
+              <option>--open-files-limit</option> option to
+              <command>mysqld</command> or
+              <command>mysqld_safe</command>. The value is 0 on systems
+              where MySQL can't change the number of open files. This
+              variable was added in MySQL 3.23.20.
             </para>
           </listitem>
 
@@ -4349,8 +4345,8 @@
             </para>
 
             <para>
-              The port on which the server listens for TCP/IP
-              connections. This variable can be set with the
+              The number of the port on which the server listens for
+              TCP/IP connections. This variable can be set with the
               <option>--port</option> option.
             </para>
           </listitem>
@@ -4397,9 +4393,9 @@
             </para>
 
             <para>
-              Do not cache results that are bigger than this. The
-              default value is 1MB. This variable was added in MySQL
-              4.0.1.
+              Don't cache results that are larger than this number of
+              bytes. The default value is 1MB. This variable was added
+              in MySQL 4.0.1.
             </para>
           </listitem>
 
@@ -4438,7 +4434,7 @@
             </para>
 
             <para>
-              Set query cache type. Setting the
+              Set the query cache type. Setting the
               <literal>GLOBAL</literal> value sets the type for all
               clients that connect thereafter. Individual clients can
               set the <literal>SESSION</literal> value to affect their
@@ -4489,9 +4485,9 @@
               Normally, when one client acquires a
               <literal>WRITE</literal> lock on a
               <literal>MyISAM</literal> table, other clients are not
-              blocked from issuing queries for the table if the query
-              results are present in the query cache. Setting this
-              variable to 1 causes acquisition of a
+              blocked from issuing statements that read from the table
+              if the query results are present in the query cache.
+              Setting this variable to 1 causes acquisition of a
               <literal>WRITE</literal> lock for a table to invalidate
               any queries in the query cache that refer to the table.
               This forces other clients that attempt to access the table
@@ -4559,10 +4555,11 @@
             <para>
               When the variable is set to <literal>ON</literal> for a
               replication slave server, it causes the slave to allow no
-              updates except from slave threads or from users with the
-              <literal>SUPER</literal> privilege. This can be useful to
-              ensure that a slave server accepts no updates from
-              clients. This variable was added in MySQL 4.0.14.
+              updates except from slave threads or from users that have
+              the <literal>SUPER</literal> privilege. This can be useful
+              to ensure that a slave server accepts updates only from
+              its master server and not from clients. This variable was
+              added in MySQL 4.0.14.
             </para>
           </listitem>
 
@@ -4574,7 +4571,7 @@
             <para>
               Disables or enables automatic purging of relay logs as
               soon as they are not needed any more. The default value is
-              <literal>1</literal> (enabled). This variable was added in
+              1 (<literal>ON</literal>). This variable was added in
               MySQL 4.1.1.
             </para>
           </listitem>
@@ -4585,16 +4582,16 @@
             </para>
 
             <para>
-              When reading rows in sorted order after a sort, the rows
-              are read through this buffer to avoid disk seeks. Setting
-              the variable to a large value can improve <literal>ORDER
-              BY</literal> performance considerably. However, this is a
-              buffer allocated for each client, so you should not set
-              the global variable to a large value. Instead, change the
-              session variable only from within those clients that need
-              to run large queries. This variable was added in MySQL
-              4.0.3. Previously, it was named
-              <literal>record_rnd_buffer</literal>.
+              When reading rows in sorted order following a key-sorting
+              operation, the rows are read through this buffer to avoid
+              disk seeks. Setting the variable to a large value can
+              improve <literal>ORDER BY</literal> performance by a lot.
+              However, this is a buffer allocated for each client, so
+              you should not set the global variable to a large value.
+              Instead, change the session variable only from within
+              those clients that need to run large queries. This
+              variable was added in MySQL 4.0.3. Previously, it was
+              named <literal>record_rnd_buffer</literal>.
             </para>
           </listitem>
 
@@ -4635,7 +4632,7 @@
 
             <para>
               You should enable this option if you want to prevent all
-              usage of passwords in the old format (and hence insecure
+              use of passwords in the old format (and hence insecure
               communication over the network). This variable was added
               in MySQL 4.1.1.
             </para>
@@ -4644,17 +4641,6 @@
               Server startup fails with an error if this option is
               enabled and the privilege tables are in pre-4.1 format.
             </para>
-
-            <remark role="todo">
-              this does not really belong here in a discussion of server
-              variables
-            </remark>
-
-            <para>
-              When used as a client-side option, the client refuses to
-              connect to a server if the server requires a password in
-              old format for the client account.
-            </para>
           </listitem>
 
           <listitem>
@@ -4663,9 +4649,11 @@
             </para>
 
             <para>
-              The value of the <option>--server-id</option> option. It
-              is used for master and slave replication servers. This
-              variable was added in MySQL 3.23.26.
+              The server ID. This value is set by the
+              <option>--server-id</option> option. It is used for
+              replication to enable master and slave servers to identify
+              themselves uniquely. This variable was added in MySQL
+              3.23.26.
             </para>
           </listitem>
 
@@ -4695,13 +4683,23 @@
 
           <listitem>
             <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
+
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <literal>skip_external_locking</literal>
             </para>
 
             <para>
               This is <literal>OFF</literal> if
-              <command>mysqld</command> uses external locking. This
-              variable was added in MySQL 4.0.3. Previously, it was
+              <command>mysqld</command> uses external locking,
+              <literal>ON</literal> if external locking is disabled.
+              This variable was added in MySQL 4.0.3. Previously, it was
               named <literal>skip_locking</literal>.
             </para>
           </listitem>
@@ -4717,8 +4715,10 @@
               use a Unix socket file. On Windows, local connections use
               a named pipe or shared memory. On NetWare, only TCP/IP
               connections are supported, so do not set this variable to
-              <literal>ON</literal>. This variable was added in MySQL
-              3.22.23.
+              <literal>ON</literal>. This variable can be set to
+              <literal>ON</literal> with the
+              <option>--skip-networking</option> option. This variable
+              was added in MySQL 3.22.23.
             </para>
           </listitem>
 
@@ -4769,7 +4769,7 @@
             <para>
               The name of the directory where the slave creates
               temporary files for replicating <literal>LOAD DATA
-              INFILE</literal> statement. This variable was added in
+              INFILE</literal> statements. This variable was added in
               MySQL 4.0.0.
             </para>
           </listitem>
@@ -4782,7 +4782,9 @@
             <para>
               The number of seconds to wait for more data from a
               master/slave connection before aborting the read. This
-              variable was added in MySQL 3.23.40.
+              timeout applies only to TCP/IP connections, not to
+              connections made via Unix socket files, named pipes, or
+              shared memory. This variable was added in MySQL 3.23.40.
             </para>
           </listitem>
 
@@ -4838,10 +4840,18 @@
             </para>
 
             <para>
-              On Unix, this is the Unix socket file used for local
-              client connections. On Windows, this is the name of the
-              named pipe used for local client connections.
+              On Unix platforms, this variable is the name of the socket
+              file that is used for local client connections. The
+              default is <filename>/tmp/mysql.sock</filename>. (For some
+              distribution formats, the directory might be different,
+              such as <filename>/var/lib/mysql</filename> for RPMs.)
             </para>
+
+            <para>
+              On Windows, this variable is the name of the named pipe
+              that is used for local client connections. The default
+              value is <literal>MySQL</literal> (not case sensitive).
+            </para>
           </listitem>
 
           <listitem>
@@ -4876,7 +4886,9 @@
 
             <para>
               The number of events from the master that a slave server
-              should skip. It was added in MySQL 3.23.33.
+              should skip. See
+              <xref linkend="set-global-sql-slave-skip-counter"/>. This
+              variable was added in MySQL 3.23.33.
             </para>
           </listitem>
 
@@ -4899,18 +4911,18 @@
 
             <para>
               If the value of this variable is positive, the MySQL
-              server synchronizes its binary log to disk
-              (<literal>fdatasync()</literal>) after every
-              <literal>sync_binlog</literal>'th write to this binary
-              log. Note that there is one write to the binary log per
-              statement if in autocommit mode, and otherwise one write
-              per transaction. The default value is 0 which does no
-              sync'ing to disk. A value of 1 is the safest choice,
-              because in case of crash you lose at most one
-              statement/transaction from the binary log; but it is also
-              the slowest choice (unless the disk has a battery-backed
-              cache, which makes sync'ing very fast). This variable was
-              added in MySQL 4.1.3.
+              server synchronizes its binary log to disk (using
+              <literal>fdatasync()</literal>) after every
+              <literal>sync_binlog</literal> writes to the binary log.
+              Note that there is one write to the binary log per
+              statement if autocommit is enabled, and one write per
+              transaction otherwise. The default value is 0, which does
+              no synchronizing to disk. A value of 1 is the safest
+              choice, because in the event of a crash you lose at most
+              one statement or transaction from the binary log. However,
+              it is also the slowest choice (unless the disk has a
+              battery-backed cache, which makes synchronization very
+              fast). This variable was added in MySQL 4.1.3.
             </para>
           </listitem>
 
@@ -4920,13 +4932,13 @@
             </para>
 
             <para>
-              This was added as a command-line option in MySQL 4.0.18,
-              and is also a settable global variable since MySQL 4.1.3.
-              If set to <literal>1</literal>, when a non-temporary table
-              is created it synchronizes its <filename>.frm</filename>
-              file to disk (<literal>fdatasync()</literal>); this is
-              slower but safer in case of a crash. The default is
-              <literal>1</literal>.
+              If this variable is set to 1, when any non-temporary table
+              is created its <filename>.frm</filename> file is
+              synchronized to disk (using
+              <literal>fdatasync()</literal>). This is slower but safer
+              in case of a crash. The default is 1. This was added as a
+              command-line option in MySQL 4.0.18. It is also a settable
+              global variable as of MySQL 4.1.3.
             </para>
           </listitem>
 
@@ -4966,11 +4978,8 @@
               do <literal>FLUSH TABLES</literal> often (which just
               forces all tables to be closed and reopened), then you
               should increase the value of the
-              <literal>table_cache</literal> variable.
-            </para>
-
-            <para>
-              For more information about the table cache, see
+              <literal>table_cache</literal> variable. For more
+              information about the table cache, see
               <xref linkend="table-cache"/>.
             </para>
           </listitem>
@@ -5003,13 +5012,13 @@
               taken from the cache if possible, and only when the cache
               is empty is a new thread created. This variable can be
               increased to improve performance if you have a lot of new
-              connections. (Normally this does not give a notable
+              connections. (Normally this doesn't provide a notable
               performance improvement if you have a good thread
               implementation.) By examining the difference between the
               <literal>Connections</literal> and
-              <literal>Threads_created</literal> status variables (see
-              <xref linkend="server-status-variables"/>, for details)
-              you can see how efficient the thread cache is. This
+              <literal>Threads_created</literal> status variables, you
+              can see how efficient the thread cache is. For details,
+              see <xref linkend="server-status-variables"/>. This
               variable was added in MySQL 3.23.16.
             </para>
           </listitem>
@@ -5060,12 +5069,15 @@
             </para>
 
             <para>
-              The current time zone. The initial value of this is
-              <literal>'SYSTEM'</literal> (use the value of
-              <literal>system_time_zone</literal>), but can be specified
-              explicitly at server startup time with the
-              <option>--default-time-zone</option> option. This variable
-              was added in MySQL 4.1.3.
+              The current time zone. This variable is used to initialize
+              the tome zone for each client that connects. By default,
+              the initial value of this is <literal>'SYSTEM'</literal>
+              (which means, <quote>use the value of
+              <literal>system_time_zone</literal></quote>). The value
+              can be specified explicitly at server startup with the
+              <option>--default-time-zone</option> option. See
+              <xref linkend="time-zone-support"/>. This variable was
+              added in MySQL 4.1.3.
             </para>
           </listitem>
 
@@ -5118,9 +5130,9 @@
             </para>
 
             <para>
-              This feature can be used to spread the load between
-              several physical disks. If the MySQL server is acting as a
-              replication slave, you should not set
+              The multiple-directory feature can be used to spread the
+              load between several physical disks. If the MySQL server
+              is acting as a replication slave, you should not set
               <literal>tmpdir</literal> to point to a directory on a
               memory-based filesystem or to a directory that is cleared
               when the server host restarts. A replication slave needs
@@ -5128,13 +5140,12 @@
               so that it can replicate temporary tables or <literal>LOAD
               DATA INFILE</literal> operations. If files in the
               temporary file directory are lost when the server
-              restarts, replication fails. However, if you're using
-              MySQL 4.0.0 or later, you may set the slave's temporary
+              restarts, replication fails. However, if you are using
+              MySQL 4.0.0 or later, you can set the slave's temporary
               directory using the <literal>slave_load_tmpdir</literal>
               variable. In that case, the slave won't use the general
-              <literal>tmpdir</literal> any more, which means you can
-              set <literal>tmpdir</literal> to a non-permanent location
-              then.
+              <literal>tmpdir</literal> value and you can set
+              <literal>tmpdir</literal> to a non-permanent location.
             </para>
 
             <para>
@@ -5180,6 +5191,14 @@
               <literal>malloc()</literal> calls. This variable was added
               in MySQL 4.0.16.
             </para>
+
+            <para>
+              The <literal>system_time_zone</literal> variable differs
+              from <literal>time_zone</literal>. Although they might
+              have the same value, the latter variable is used to
+              initialize the tome zone for each client that connects.
+              See <xref linkend="time-zone-support"/>.
+            </para>
           </listitem>
 
           <listitem>
@@ -5196,10 +5215,10 @@
               This variable is set by the <literal>SET TRANSACTION
               ISOLATION LEVEL</literal> statement. See
               <xref linkend="set-transaction"/>. If you set
-              <literal>tx_isolation</literal> level directly to an
-              isolation level name that contains a space, the name
-              should be enclosed within quotes, with the space replaced
-              by a dash. For example:
+              <literal>tx_isolation</literal> directly to an isolation
+              level name that contains a space, the name should be
+              enclosed within quotes, with the space replaced by a dash.
+              For example:
             </para>
 
 <programlisting>
@@ -5250,8 +5269,8 @@
             </para>
 
             <para>
-              The type of machine MySQL was built on. This variable was
-              added in MySQL 4.1.1.
+              The type of machine or architecture on which MySQL was
+              built. This variable was added in MySQL 4.1.1.
             </para>
           </listitem>
 
@@ -5261,8 +5280,8 @@
             </para>
 
             <para>
-              The type of operating system MySQL was built on. This
-              variable was added in MySQL 4.0.19.
+              The type of operating system on which MySQL was built.
+              This variable was added in MySQL 4.0.19.
             </para>
           </listitem>
 
@@ -5274,9 +5293,8 @@
             <para>
               The number of seconds the server waits for activity on a
               non-interactive connection before closing it. This timeout
-              applies to TCP/IP connections only. It does not apply to
-              connections made via Unix socket files, named pipes, or
-              shared memory.
+              applies only to TCP/IP connections, not to connections
+              made via Unix socket files, named pipes, or shared memory.
             </para>
 
             <para>
@@ -5309,13 +5327,33 @@
             The following table shows the full list of all dynamic
             system variables. The last column indicates for each
             variable whether <literal>GLOBAL</literal> or
-            <literal>SESSION</literal> (or both) apply.
+            <literal>SESSION</literal> (or both) apply. The table also
+            lists session options that can be set with the
+            <literal>SET</literal> statement.
+            <xref linkend="set-option"/>, discusses these options.
           </para>
 
+          <para>
+            Variables that have a type of <quote>string</quote> take a
+            string value. Variables that have a type of
+            <quote>numeric</quote> take a numeric value. Variables that
+            have a type of <quote>boolean</quote> can be set to 0, 1,
+            <literal>ON</literal> or <literal>OFF</literal>. (If you set
+            them on the command line or in an option file, use the
+            numeric values.) Variables that are marked as
+            <quote>enumeration</quote> normally should be set to one of
+            the available values for the variable, but can also be set
+            to the number that corresponds to the desired enumeration
+            value. For enumerated system variables, the first
+            enumeration value corresponds to 0. This differs from
+            <literal>ENUM</literal> columns, for which the first
+            enumeration value corresponds to 1.
+          </para>
+
           <informaltable>
             <tgroup cols="3">
-              <colspec colwidth="45*"/>
-              <colspec colwidth="25*"/>
+              <colspec colwidth="50*"/>
+              <colspec colwidth="20*"/>
               <colspec colwidth="30*"/>
               <tbody>
                 <row>
@@ -5534,11 +5572,13 @@
                 </row>
                 <row>
                   <entry><literal>innodb_thread_concurrency</literal></entry>
-                  <entry>numeric <literal>GLOBAL</literal></entry>
+                  <entry>numeric</entry>
+                  <entry><literal>GLOBAL</literal></entry>
                 </row>
                 <row>
                   <entry><literal>innodb_thread_sleep_delay</literal></entry>
-                  <entry>numeric <literal>GLOBAL</literal></entry>
+                  <entry>numeric</entry>
+                  <entry><literal>GLOBAL</literal></entry>
                 </row>
                 <row>
                   <entry><literal>insert_id</literal></entry>
@@ -6014,22 +6054,6 @@
             </tgroup>
           </informaltable>
 
-          <para>
-            Variables that are marked as <quote>string</quote> take a
-            string value. Variables that are marked as
-            <quote>numeric</quote> take a numeric value. Variables that
-            are marked as <quote>boolean</quote> can be set to
-            <literal>0</literal>, <literal>1</literal>,
-            <literal>ON</literal> or <literal>OFF</literal>. Variables
-            that are marked as <quote>enumeration</quote> normally
-            should be set to one of the available values for the
-            variable, but can also be set to the number that corresponds
-            to the desired enumeration value. For enumeration-valued
-            system variables, the first enumeration value corresponds to
-            0. This differs from <literal>ENUM</literal> columns, for
-            which the first enumeration value corresponds to 1.
-          </para>
-
         </refsection>
 
       </refsection>
@@ -6049,15 +6073,11 @@
 
         <para>
           The server maintains many status variables that provide
-          information about its operations. You can view these variables
+          information about its operation. You can view these variables
           and their values by using the <literal>SHOW STATUS</literal>
           statement:
         </para>
 
-        <remark role="todo">
-          Add variables new in 4.1.
-        </remark>
-
 <programlisting>
 mysql&gt; <userinput>SHOW STATUS;</userinput>
 +--------------------------+------------+
@@ -6107,8 +6127,8 @@
             </para>
 
             <para>
-              The number of tries to connect to the MySQL server that
-              failed. See <xref linkend="communication-errors"/>.
+              The number of failed attempts to connect to the MySQL
+              server. See <xref linkend="communication-errors"/>.
             </para>
           </listitem>
 
@@ -6217,25 +6237,23 @@
             </itemizedlist>
 
             <para>
-              Those variables stand for prepared statements commands.
+              Those variables stand for prepared statement commands.
               Their names refer to the
               <literal>COM_<replaceable>xxx</replaceable></literal>
-              command set used in the network layer; in other words:
-              Their values are being increased whenever prepared
-              statements API calls such as
-              <command>mysql_stmt_prepare()</command>,
+              command set used in the network layer. In other words,
+              their values increase whenever prepared statement API
+              calls such as <command>mysql_stmt_prepare()</command>,
               <command>mysql_stmt_execute()</command>, and so forth are
               executed. However, <literal>Com_stmt_prepare</literal>,
               <literal>Com_stmt_execute</literal> and
-              <literal>Com_stmt_close</literal> are also increased when
-              one issues the following SQL statements:
+              <literal>Com_stmt_close</literal> also increase for
               <literal>PREPARE</literal>, <literal>EXECUTE</literal>, or
-              <literal>DEALLOCATE PREPARE</literal> respectively.
+              <literal>DEALLOCATE PREPARE</literal>, respectively.
               Additionally, the values of the older (available since
               MySQL 4.1.3) statement counter variables
               <literal>Com_prepare_sql</literal>,
               <literal>Com_execute_sql</literal>, and
-              <literal>Com_dealloc_sql</literal> are increased for the
+              <literal>Com_dealloc_sql</literal> increase for the
               <literal>PREPARE</literal>, <literal>EXECUTE</literal>,
               and <literal>DEALLOCATE PREPARE</literal> statements.
             </para>
@@ -6293,8 +6311,8 @@
             <para>
               The number of in-memory temporary tables created
               automatically by the server while executing statements. If
-              <literal>Created_tmp_disk_tables</literal> is big, you may
-              want to increase the <literal>tmp_table_size</literal>
+              <literal>Created_tmp_disk_tables</literal> is large, you
+              may want to increase the <literal>tmp_table_size</literal>
               value to cause temporary tables to be memory-based instead
               of disk-based.
             </para>
@@ -6388,8 +6406,8 @@
 
             <para>
               The number of times the first entry was read from an
-              index. If this is high, it suggests that the server is
-              doing a lot of full index scans; for example,
+              index. If this value is high, it suggests that the server
+              is doing a lot of full index scans; for example,
               <literal>SELECT col1 FROM foo</literal>, assuming that
               <literal>col1</literal> is indexed.
             </para>
@@ -6402,8 +6420,8 @@
 
             <para>
               The number of requests to read a row based on a key. If
-              this is high, it is a good indication that your queries
-              and tables are properly indexed.
+              this value is high, it is a good indication that your
+              tables are properly indexed for your queries.
             </para>
           </listitem>
 
@@ -6414,8 +6432,9 @@
 
             <para>
               The number of requests to read the next row in key order.
-              This is incremented if you are querying an index column
-              with a range constraint or if you are doing an index scan.
+              This value is incremented if you are querying an index
+              column with a range constraint or if you are doing an
+              index scan.
             </para>
           </listitem>
 
@@ -6439,10 +6458,10 @@
 
             <para>
               The number of requests to read a row based on a fixed
-              position. This is high if you are doing a lot of queries
-              that require sorting of the result. You probably have a
-              lot of queries that require MySQL to scan whole tables or
-              you have joins that do not use keys properly.
+              position. This value is high if you are doing a lot of
+              queries that require sorting of the result. You probably
+              have a lot of queries that require MySQL to scan entire
+              tables or you have joins that don't use keys properly.
             </para>
           </listitem>
 
@@ -6453,10 +6472,10 @@
 
             <para>
               The number of requests to read the next row in the data
-              file. This is high if you are doing a lot of table scans.
-              Generally this suggests that your tables are not properly
-              indexed or that your queries are not written to take
-              advantage of the indexes you have.
+              file. This value is high if you are doing a lot of table
+              scans. Generally this suggests that your tables are not
+              properly indexed or that your queries are not written to
+              take advantage of the indexes you have.
             </para>
           </listitem>
 
@@ -8456,7 +8475,7 @@
 
             <listitem>
               <para>
-                <option>--timezone=<replaceable>zone</replaceable></option>
+                <option>--timezone=<replaceable>timezone</replaceable></option>
               </para>
 
               <para>
@@ -10165,13 +10184,13 @@
           </para>
 
           <para>
-            If this is enabled, a user cannot create new users with the
-            <literal>GRANT</literal> statement unless the user has the
-            <literal>INSERT</literal> privilege for the
+            If this is enabled, a user cannot create new users by using
+            the <literal>GRANT</literal> statement unless the user has
+            the <literal>INSERT</literal> privilege for the
             <literal>mysql.user</literal> table. If you want a user to
-            have the ability to create new users with those privileges
-            that the user has right to grant, you should grant the user
-            the following privilege:
+            have the ability to create new users that have those
+            privileges that the user has right to grant, you should
+            grant the user the following privilege:
           </para>
 
 <programlisting>
@@ -10195,6 +10214,13 @@
             Disallow authentication for accounts that have old (pre-4.1)
             passwords. This option is available as of MySQL 4.1.1.
           </para>
+
+          <para>
+            The <command>mysql</command> client also has a
+            <option>--secure-auth</option> option, which prevents
+            connections to a server if the server requires a password in
+            old format for the client account.
+          </para>
         </listitem>
 
         <listitem>
@@ -11663,9 +11689,9 @@
         <listitem>
           <para>
             The <literal>GRANT</literal> privilege enables users to give
-            their privileges to other users. Two users with different
-            privileges and with the <literal>GRANT</literal> privilege
-            are able to combine privileges.
+            their privileges to other users. Two users that have
+            different privileges and with the <literal>GRANT</literal>
+            privilege are able to combine privileges.
           </para>
         </listitem>
 
@@ -19406,6 +19432,7 @@
             The system time zone. When the server starts, it attempts to
             determine the time zone of the host machine and uses it to
             set the <literal>system_time_zone</literal> system variable.
+            The value does not change thereafter.
           </para>
         </listitem>
 
@@ -19414,9 +19441,10 @@
             The server's current time zone. The global
             <literal>time_zone</literal> system variable indicates the
             time zone the server currently is operating in. The initial
-            value is <literal>'SYSTEM'</literal>, which indicates that
-            the server time zone is the same as the system time zone.
-            The initial value can be specified explicitly with the
+            value for <literal>time_zone</literal> is
+            <literal>'SYSTEM'</literal>, which indicates that the server
+            time zone is the same as the system time zone. The initial
+            value can be specified explicitly with the
             <option>--default-time-zone=<replaceable>timezone</replaceable></option>
             option. If you have the <literal>SUPER</literal> privilege,
             you can set the global value at runtime with this statement:
@@ -19431,9 +19459,10 @@
           <para>
             Per-connection time zones. Each client that connects has its
             own time zone setting, given by the session
-            <literal>time_zone</literal> variable. Initially this is the
-            same as the global <literal>time_zone</literal> variable,
-            but can be reset with this statement:
+            <literal>time_zone</literal> variable. Initially, the
+            session variable takes its value from the global
+            <literal>time_zone</literal> variable, but the client can
+            change its own time zone with this statement:
           </para>
 
 <programlisting>
@@ -19444,7 +19473,7 @@
       </itemizedlist>
 
       <para>
-        The current values of the global and per-connection time zones
+        The current values of the global and client-specific time zones
         can be retrieved like this:
       </para>
 
@@ -19456,13 +19485,13 @@
         <replaceable>timezone</replaceable> values can be given as
         strings indicating an offset from UTC, such as
         <literal>'+10:00'</literal> or <literal>'-6:00'</literal>. If
-        the time zone-related tables in the <literal>mysql</literal>
+        the time zone information tables in the <literal>mysql</literal>
         database have been created and populated, you can also used
         named time zones, such as <literal>'Europe/Helsinki'</literal>,
         <literal>'US/Eastern'</literal>, or <literal>'MET'</literal>.
-        The value <literal>'SYSTEM'</literal> indicates that the time
-        zone should be the same as the system time zone. Time zone names
-        are not case sensitive.
+        The value <literal>'SYSTEM'</literal> can be used to indicate
+        that the time zone should be the same as the system time zone.
+        Time zone names are not case sensitive.
       </para>
 
       <para>
@@ -19508,56 +19537,64 @@
       <para>
         <command>mysql_tzinfo_to_sql</command> also can be used to load
         a single time zone file, and to generate leap second
-        information.
+        information:
       </para>
 
-      <para>
-        To load a single time zone file
-        <replaceable>tz_file</replaceable> that corresponds to a time
-        zone name <replaceable>tz_name</replaceable>, invoke
-        <command>mysql_tzinfo_to_sql</command> like this:
-      </para>
+      <itemizedlist>
 
+        <listitem>
+          <para>
+            To load a single time zone file
+            <replaceable>tz_file</replaceable> that corresponds to a
+            time zone name <replaceable>tz_name</replaceable>, invoke
+            <command>mysql_tzinfo_to_sql</command> like this:
+          </para>
+
 <programlisting>
 shell&gt; <userinput>mysql_tzinfo_to_sql <replaceable>tz_file</replaceable> <replaceable>tz_name</replaceable> | mysql -u root mysql</userinput>
 </programlisting>
+        </listitem>
 
-      <para>
-        If your time zone needs to account for leap seconds, initialize
-        the leap second information like this, where
-        <replaceable>tz_file</replaceable> is the name of your time zone
-        file:
-      </para>
+        <listitem>
+          <para>
+            If your time zone needs to account for leap seconds,
+            initialize the leap second information like this, where
+            <replaceable>tz_file</replaceable> is the name of your time
+            zone file:
+          </para>
 
 <programlisting>
 shell&gt; <userinput>mysql_tzinfo_to_sql --leap <replaceable>tz_file</replaceable> | mysql -u root mysql</userinput>
 </programlisting>
+        </listitem>
 
+      </itemizedlist>
+
       <para>
-        If your system does not have a zoneinfo database (for example,
+        If your system doesn't have a zoneinfo database (for example,
         Windows or HP-UX), you can use the package of pre-built time
         zone tables that is available for download at
         <ulink url="&base-url-downloads;timezones.html"/>. This package
         contains <filename>.frm</filename>, <filename>.MYD</filename>,
         and <filename>.MYI</filename> files for the
         <literal>MyISAM</literal> time zone tables. These tables should
-        belong to the <literal>mysql</literal> database, so you should
+        be part of the <literal>mysql</literal> database, so you should
         place the files in the <filename>mysql</filename> subdirectory
-        of your MySQL server's data directory. The server should be shut
-        down while you do this.
+        of your MySQL server's data directory. The server should be
+        stopped while you do this.
       </para>
 
       <para>
-        <emphasis role="bold">Warning!</emphasis> Please do not use the
+        <emphasis role="bold">Warning</emphasis>: Please don't use the
         downloadable package if your system has a zoneinfo database. Use
-        the <command>mysql_tzinfo_to_sql</command> utility instead!
+        the <command>mysql_tzinfo_to_sql</command> utility instead.
         Otherwise, you may cause a difference in datetime handling
         between MySQL and other applications on your system.
       </para>
 
       <para>
-        For information about time zone settings in replication setup
-        please look into <xref linkend="replication-features"/>.
+        For information about time zone settings in replication setup,
+        please see <xref linkend="replication-features"/>.
       </para>
 
     </section>

Modified: trunk/refman-4.1/problems.xml
===================================================================
--- trunk/refman-4.1/problems.xml	2006-01-27 23:06:29 UTC (rev 1071)
+++ trunk/refman-4.1/problems.xml	2006-01-27 23:52:05 UTC (rev 1072)
@@ -2613,8 +2613,7 @@
             the same data directory on a system that doesn't support
             good filesystem locks (normally handled by the
             <literal>lockd</literal> lock manager), or you are running
-            multiple servers with the
-            <option>--skip-external-locking</option> option.
+            multiple servers with external locking disabled.
           </para>
         </listitem>
 

Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml	2006-01-27 23:06:29 UTC (rev 1071)
+++ trunk/refman-5.0/charset.xml	2006-01-27 23:52:05 UTC (rev 1072)
@@ -1907,8 +1907,8 @@
       </itemizedlist>
 
       <para>
-        For example, with <literal>CASE &hellip; WHEN a THEN b WHEN b
-        THEN c COLLATE <replaceable>X</replaceable> END</literal>, the
+        For example, with <literal>CASE ... WHEN a THEN b WHEN b THEN c
+        COLLATE <replaceable>X</replaceable> END</literal>, the
         resulting collation is <replaceable>X</replaceable>. The same
         applies for <literal>CASE</literal>, <literal>UNION</literal>,
         <literal>||</literal>, <literal>CONCAT()</literal>,
@@ -1957,8 +1957,8 @@
 </programlisting>
 
       <para>
-        <literal>CONVERT(&hellip; USING &hellip;)</literal> is
-        implemented according to the standard SQL specification.
+        <literal>CONVERT(... USING ...)</literal> is implemented
+        according to the standard SQL specification.
       </para>
 
       <para>
@@ -1993,8 +1993,8 @@
       <para>
         You may not use a <literal>COLLATE</literal> clause inside a
         <literal>CAST()</literal>, but you may use it outside. That is,
-        <literal>CAST(&hellip; COLLATE &hellip;)</literal> is illegal,
-        but <literal>CAST(&hellip;) COLLATE &hellip;</literal> is legal.
+        <literal>CAST(... COLLATE ...)</literal> is illegal, but
+        <literal>CAST(...) COLLATE ...</literal> is legal.
       </para>
 
       <para>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-27 23:06:29 UTC (rev 1071)
+++ trunk/refman-5.0/database-administration.xml	2006-01-27 23:52:05 UTC (rev 1072)
@@ -733,7 +733,7 @@
 
           <listitem>
             <para>
-              <option>--default-time-zone=<replaceable>zone</replaceable></option>
+              <option>--default-time-zone=<replaceable>timezone</replaceable></option>
             </para>
 
             <para>
@@ -1454,11 +1454,11 @@
             </para>
 
             <para>
-              If this is enabled, a user can't create new users with the
-              <literal>GRANT</literal> statement, if the user doesn't
-              have the <literal>INSERT</literal> privilege for the
-              <literal>mysql.user</literal> table or any column in the
-              table.
+              If this is enabled, a user can't create new users by using
+              the <literal>GRANT</literal> statement, if the user
+              doesn't have the <literal>INSERT</literal> privilege for
+              the <literal>mysql.user</literal> table or any column in
+              the table.
             </para>
           </listitem>
 
@@ -4319,8 +4319,8 @@
             </para>
 
             <para>
-              After this many write locks, allow some read locks to run
-              in between.
+              After this many write locks, allow some pending read lock
+              requests to be processed in between.
             </para>
           </listitem>
 
@@ -4373,7 +4373,7 @@
               use while re-creating a <literal>MyISAM</literal> index
               (during <literal>REPAIR TABLE</literal>, <literal>ALTER
               TABLE</literal>, or <literal>LOAD DATA INFILE</literal>).
-              If the file size would be bigger than this value, the
+              If the file size would be larger than this value, the
               index is created using the key cache instead, which is
               slower. The value is given in bytes.
             </para>
@@ -4386,6 +4386,7 @@
 
             <para>
               The value of the <option>--myisam-recover</option> option.
+              See <xref linkend="server-options"/>.
             </para>
           </listitem>
 
@@ -4410,7 +4411,7 @@
             </para>
 
             <para>
-              The buffer that is allocated when sorting
+              The size of the buffer that is allocated when sorting
               <literal>MyISAM</literal> indexes during a <literal>REPAIR
               TABLE</literal> or when creating indexes with
               <literal>CREATE INDEX</literal> or <literal>ALTER
@@ -4489,8 +4490,8 @@
 
             <para>
               The communication buffer is reset to this size between SQL
-              statements. This should not normally be changed, but if
-              you have very little memory, you can set it to the
+              statements. This variable should not normally be changed,
+              but if you have very little memory, you can set it to the
               expected length of statements sent by clients. If
               statements exceed this length, the buffer is automatically
               enlarged, up to <literal>max_allowed_packet</literal>
@@ -4505,8 +4506,10 @@
 
             <para>
               The number of seconds to wait for more data from a
-              connection before aborting the read. When the server is
-              reading from the client,
+              connection before aborting the read. This timeout applies
+              only to TCP/IP connections, not to connections made via
+              Unix socket files, named pipes, or shared memory. When the
+              server is reading from the client,
               <literal>net_read_timeout</literal> is the timeout value
               controlling when to abort. When the server is writing to
               the client, <literal>net_write_timeout</literal> is the
@@ -4535,8 +4538,10 @@
 
             <para>
               The number of seconds to wait for a block to be written to
-              a connection before aborting the write. See also
-              <literal>net_read_timeout</literal>.
+              a connection before aborting the write. This timeout
+              applies only to TCP/IP connections, not to connections
+              made via Unix socket files, named pipes, or shared memory.
+              See also <literal>net_read_timeout</literal>.
             </para>
           </listitem>
 
@@ -4571,25 +4576,13 @@
 
             <para>
               This is not a variable, but it can be used when setting
-              some variables. It's described in
+              some variables. It is described in
               <xref linkend="set-option"/>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>one_shot</literal>
-            </para>
-
-            <para>
-              This is not a variable, but it can be used when setting
-              some variables. It's described in
-              <xref linkend="set-option"/>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <literal>open_files_limit</literal>
             </para>
 
@@ -4597,9 +4590,11 @@
               The number of files that the operating system allows
               <command>mysqld</command> to open. This is the real value
               allowed by the system and might be different from the
-              value you gave <command>mysqld</command> as a startup
-              option. The value is 0 on systems where MySQL can't change
-              the number of open files.
+              value you gave using the
+              <option>--open-files-limit</option> option to
+              <command>mysqld</command> or
+              <command>mysqld_safe</command>. The value is 0 on systems
+              where MySQL can't change the number of open files.
             </para>
           </listitem>
 
@@ -4657,8 +4652,8 @@
             </para>
 
             <para>
-              The port on which the server listens for TCP/IP
-              connections. This variable can be set with the
+              The number of the port on which the server listens for
+              TCP/IP connections. This variable can be set with the
               <option>--port</option> option.
             </para>
           </listitem>
@@ -4709,7 +4704,7 @@
 
             <para>
               Don't cache results that are larger than this number of
-              bytes. The default value is 1048576 (1MB).
+              bytes. The default value is 1MB.
             </para>
           </listitem>
 
@@ -4747,7 +4742,7 @@
             </para>
 
             <para>
-              Set query cache type. Setting the
+              Set the query cache type. Setting the
               <literal>GLOBAL</literal> value sets the type for all
               clients that connect thereafter. Individual clients can
               set the <literal>SESSION</literal> value to affect their
@@ -4798,9 +4793,9 @@
               Normally, when one client acquires a
               <literal>WRITE</literal> lock on a
               <literal>MyISAM</literal> table, other clients are not
-              blocked from issuing queries for the table if the query
-              results are present in the query cache. Setting this
-              variable to 1 causes acquisition of a
+              blocked from issuing statements that read from the table
+              if the query results are present in the query cache.
+              Setting this variable to 1 causes acquisition of a
               <literal>WRITE</literal> lock for a table to invalidate
               any queries in the query cache that refer to the table.
               This forces other clients that attempt to access the table
@@ -4862,11 +4857,12 @@
             <para>
               When the variable is set to <literal>ON</literal> for a
               replication slave server, it causes the slave to allow no
-              updates except from slave threads or from users with the
-              <literal>SUPER</literal> privilege. This can be useful to
-              ensure that a slave server accepts no updates from
-              clients. As of MySQL 5.0.16, this variable does not apply
-              to <literal>TEMPORARY</literal> tables.
+              updates except from slave threads or from users that have
+              the <literal>SUPER</literal> privilege. This can be useful
+              to ensure that a slave server accepts updates only from
+              its master server and not from clients. As of MySQL
+              5.0.16, this variable does not apply to
+              <literal>TEMPORARY</literal> tables.
             </para>
           </listitem>
 
@@ -4876,9 +4872,9 @@
             </para>
 
             <para>
-              Disables or enables automatic purging of relay logs as
-              soon as they are not needed any more. The default value is
-              1 (enabled).
+              Disables or enables automatic purging of relay log files
+              as soon as they are not needed any more. The default value
+              is 1 (<literal>ON</literal>).
             </para>
           </listitem>
 
@@ -4888,14 +4884,14 @@
             </para>
 
             <para>
-              When reading rows in sorted order after a sort, the rows
-              are read through this buffer to avoid disk seeks. Setting
-              the variable to a large value can improve <literal>ORDER
-              BY</literal> performance by a lot. However, this is a
-              buffer allocated for each client, so you should not set
-              the global variable to a large value. Instead, change the
-              session variable only from within those clients that need
-              to run large queries.
+              When reading rows in sorted order following a key-sorting
+              operation, the rows are read through this buffer to avoid
+              disk seeks. Setting the variable to a large value can
+              improve <literal>ORDER BY</literal> performance by a lot.
+              However, this is a buffer allocated for each client, so
+              you should not set the global variable to a large value.
+              Instead, change the session variable only from within
+              those clients that need to run large queries.
             </para>
           </listitem>
 
@@ -4915,7 +4911,7 @@
 
             <para>
               You should enable this option if you want to prevent all
-              usage of passwords employing the old format (and hence
+              use of passwords employing the old format (and hence
               insecure communication over the network).
             </para>
 
@@ -4924,17 +4920,6 @@
               enabled and the privilege tables are in pre-4.1 format.
               See <xref linkend="old-client"/>.
             </para>
-
-            <remark role="todo">
-              this doesn't really belong here in a discussion of server
-              variables
-            </remark>
-
-            <para>
-              When used as a client-side option, the client refuses to
-              connect to a server if the server requires a password in
-              old format for the client account.
-            </para>
           </listitem>
 
           <listitem>
@@ -4943,8 +4928,10 @@
             </para>
 
             <para>
-              The value of the <option>--server-id</option> option. It
-              is used for master and slave replication servers.
+              The server ID. This value is set by the
+              <option>--server-id</option> option. It is used for
+              replication to enable master and slave servers to identify
+              themselves uniquely.
             </para>
           </listitem>
 
@@ -4975,12 +4962,22 @@
 
           <listitem>
             <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
+
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <literal>skip_external_locking</literal>
             </para>
 
             <para>
               This is <literal>OFF</literal> if
-              <command>mysqld</command> uses external locking.
+              <command>mysqld</command> uses external locking,
+              <literal>ON</literal> if external locking is disabled.
             </para>
           </listitem>
 
@@ -4995,7 +4992,9 @@
               use a Unix socket file. On Windows, local connections use
               a named pipe or shared memory. On NetWare, only TCP/IP
               connections are supported, so do not set this variable to
-              <literal>ON</literal>.
+              <literal>ON</literal>. This variable can be set to
+              <literal>ON</literal> with the
+              <option>--skip-networking</option> option.
             </para>
           </listitem>
 
@@ -5042,7 +5041,7 @@
             <para>
               The name of the directory where the slave creates
               temporary files for replicating <literal>LOAD DATA
-              INFILE</literal> statement.
+              INFILE</literal> statements.
             </para>
           </listitem>
 
@@ -5053,7 +5052,10 @@
 
             <para>
               The number of seconds to wait for more data from a
-              master/slave connection before aborting the read.
+              master/slave connection before aborting the read. This
+              timeout applies only to TCP/IP connections, not to
+              connections made via Unix socket files, named pipes, or
+              shared memory.
             </para>
           </listitem>
 
@@ -5109,15 +5111,17 @@
             </para>
 
             <para>
-              <emphasis>Unix platforms</emphasis>: The socket file used
-              for local client connections. Defaults to
-              <filename>/var/lib/mysql/mysql.sock</filename>.
+              On Unix platforms, this variable is the name of the socket
+              file that is used for local client connections. The
+              default is <filename>/tmp/mysql.sock</filename>. (For some
+              distribution formats, the directory might be different,
+              such as <filename>/var/lib/mysql</filename> for RPMs.)
             </para>
 
             <para>
-              <emphasis>Windows</emphasis>: The name of the named pipe
-              used for local client connections. The default value is
-              <literal>MySQL</literal> (not case sensitive).
+              On Windows, this variable is the name of the named pipe
+              that is used for local client connections. The default
+              value is <literal>MySQL</literal> (not case sensitive).
             </para>
           </listitem>
 
@@ -5152,7 +5156,8 @@
 
             <para>
               The number of events from the master that a slave server
-              should skip.
+              should skip. See
+              <xref linkend="set-global-sql-slave-skip-counter"/>.
             </para>
           </listitem>
 
@@ -5162,12 +5167,6 @@
             </para>
 
             <para>
-              This variable is a synonym for
-              <literal>table_type</literal>. In MySQL &current-series;,
-              <literal>storage_engine</literal> is the preferred name.
-            </para>
-
-            <para>
               The default storage engine (table type). To set the
               storage engine at server startup, use the
               <option>--default-storage-engine</option> option. See
@@ -5182,16 +5181,16 @@
 
             <para>
               If the value of this variable is positive, the MySQL
-              server synchronizes its binary log to disk
-              (<literal>fdatasync()</literal>) after every
-              <literal>sync_binlog</literal>'th write to this binary
-              log. Note that there is one write to the binary log per
-              statement if in autocommit mode, and otherwise one write
-              per transaction. The default value is 0 which does no
-              synchronizing to disk. A value of 1 is the safest choice,
-              because in the event of a crash you lose at most one
-              statement/transaction from the binary log; however, it is
-              also the slowest choice (unless the disk has a
+              server synchronizes its binary log to disk (using
+              <literal>fdatasync()</literal>) after every
+              <literal>sync_binlog</literal> writes to the binary log.
+              Note that there is one write to the binary log per
+              statement if autocommit is enabled, and one write per
+              transaction otherwise. The default value is 0, which does
+              no synchronizing to disk. A value of 1 is the safest
+              choice, because in the event of a crash you lose at most
+              one statement or transaction from the binary log. However,
+              it is also the slowest choice (unless the disk has a
               battery-backed cache, which makes synchronization very
               fast).
             </para>
@@ -5203,11 +5202,11 @@
             </para>
 
             <para>
-              If this variable is set to 1, then when a non-temporary
-              table is created its <filename>.frm</filename> file is
-              synchronized to disk (<literal>fdatasync()</literal>);
-              this is slower but safer in case of a crash. The default
-              is 1.
+              If this variable is set to 1, when any non-temporary table
+              is created its <filename>.frm</filename> file is
+              synchronized to disk (using
+              <literal>fdatasync()</literal>). This is slower but safer
+              in case of a crash. The default is 1.
             </para>
           </listitem>
 
@@ -5228,6 +5227,14 @@
               <option>--timezone</option> option of the
               <command>mysqld_safe</command> script.
             </para>
+
+            <para>
+              The <literal>system_time_zone</literal> variable differs
+              from <literal>time_zone</literal>. Although they might
+              have the same value, the latter variable is used to
+              initialize the tome zone for each client that connects.
+              See <xref linkend="time-zone-support"/>.
+            </para>
           </listitem>
 
           <listitem>
@@ -5246,11 +5253,7 @@
               <literal>FLUSH TABLES</literal> a lot (which just forces
               all tables to be closed and reopened), then you should
               increase the value of the <literal>table_cache</literal>
-              variable.
-            </para>
-
-            <para>
-              For more information about the table cache, see
+              variable. For more information about the table cache, see
               <xref linkend="table-cache"/>.
             </para>
           </listitem>
@@ -5282,13 +5285,13 @@
               taken from the cache if possible, and only when the cache
               is empty is a new thread created. This variable can be
               increased to improve performance if you have a lot of new
-              connections. (Normally this doesn't give a notable
+              connections. (Normally this doesn't provide a notable
               performance improvement if you have a good thread
               implementation.) By examining the difference between the
               <literal>Connections</literal> and
-              <literal>Threads_created</literal> status variables (see
-              <xref linkend="server-status-variables"/>, for details)
-              you can see how efficient the thread cache is.
+              <literal>Threads_created</literal> status variables, you
+              can see how efficient the thread cache is. For details,
+              see <xref linkend="server-status-variables"/>.
             </para>
           </listitem>
 
@@ -5336,11 +5339,14 @@
             </para>
 
             <para>
-              The current time zone. The initial value of this is
-              <literal>'SYSTEM'</literal> (use the value of
-              <literal>system_time_zone</literal>), but can be specified
-              explicitly at server startup time with the
-              <option>--default-time-zone</option> option.
+              The current time zone. This variable is used to initialize
+              the tome zone for each client that connects. By default,
+              the initial value of this is <literal>'SYSTEM'</literal>
+              (which means, <quote>use the value of
+              <literal>system_time_zone</literal></quote>). The value
+              can be specified explicitly at server startup with the
+              <option>--default-time-zone</option> option. See
+              <xref linkend="time-zone-support"/>.
             </para>
           </listitem>
 
@@ -5375,9 +5381,9 @@
             </para>
 
             <para>
-              This feature can be used to spread the load between
-              several physical disks. If the MySQL server is acting as a
-              replication slave, you should not set
+              The multiple-directory feature can be used to spread the
+              load between several physical disks. If the MySQL server
+              is acting as a replication slave, you should not set
               <literal>tmpdir</literal> to point to a directory on a
               memory-based filesystem or to a directory that is cleared
               when the server host restarts. A replication slave needs
@@ -5385,13 +5391,12 @@
               so that it can replicate temporary tables or <literal>LOAD
               DATA INFILE</literal> operations. If files in the
               temporary file directory are lost when the server
-              restarts, replication fails. However, if you're using
-              MySQL 4.0.0 or later, you may set the slave's temporary
+              restarts, replication fails. However, if you are using
+              MySQL 4.0.0 or later, you can set the slave's temporary
               directory using the <literal>slave_load_tmpdir</literal>
               variable. In that case, the slave won't use the general
-              <literal>tmpdir</literal> any more, which means you can
-              set <literal>tmpdir</literal> to a non-permanent location
-              then.
+              <literal>tmpdir</literal> value and you can set
+              <literal>tmpdir</literal> to a non-permanent location.
             </para>
           </listitem>
 
@@ -5447,10 +5452,10 @@
               This variable is set by the <literal>SET TRANSACTION
               ISOLATION LEVEL</literal> statement. See
               <xref linkend="set-transaction"/>. If you set
-              <literal>tx_isolation</literal> level directly to an
-              isolation level name that contains a space, the name
-              should be enclosed within quotes, with the space replaced
-              by a dash. For example:
+              <literal>tx_isolation</literal> directly to an isolation
+              level name that contains a space, the name should be
+              enclosed within quotes, with the space replaced by a dash.
+              For example:
             </para>
 
 <programlisting>
@@ -5542,8 +5547,8 @@
             </para>
 
             <para>
-              The type of machine or architecture which MySQL was built
-              on.
+              The type of machine or architecture on which MySQL was
+              built.
             </para>
           </listitem>
 
@@ -5553,7 +5558,7 @@
             </para>
 
             <para>
-              The type of operating system MySQL was built on.
+              The type of operating system on which MySQL was built.
             </para>
           </listitem>
 
@@ -5565,9 +5570,8 @@
             <para>
               The number of seconds the server waits for activity on a
               non-interactive connection before closing it. This timeout
-              applies to TCP/IP connections only. It does not apply to
-              connections made via Unix socket files, named pipes, or
-              shared memory.
+              applies only to TCP/IP connections, not to connections
+              made via Unix socket files, named pipes, or shared memory.
             </para>
 
             <para>
@@ -5600,13 +5604,33 @@
             The following table shows the full list of all dynamic
             system variables. The last column indicates for each
             variable whether <literal>GLOBAL</literal> or
-            <literal>SESSION</literal> (or both) apply.
+            <literal>SESSION</literal> (or both) apply. The table also
+            lists session options that can be set with the
+            <literal>SET</literal> statement.
+            <xref linkend="set-option"/>, discusses these options.
           </para>
 
+          <para>
+            Variables that have a type of <quote>string</quote> take a
+            string value. Variables that have a type of
+            <quote>numeric</quote> take a numeric value. Variables that
+            have a type of <quote>boolean</quote> can be set to 0, 1,
+            <literal>ON</literal> or <literal>OFF</literal>. (If you set
+            them on the command line or in an option file, use the
+            numeric values.) Variables that are marked as
+            <quote>enumeration</quote> normally should be set to one of
+            the available values for the variable, but can also be set
+            to the number that corresponds to the desired enumeration
+            value. For enumerated system variables, the first
+            enumeration value corresponds to 0. This differs from
+            <literal>ENUM</literal> columns, for which the first
+            enumeration value corresponds to 1.
+          </para>
+
           <informaltable>
             <tgroup cols="3">
-              <colspec colwidth="45*"/>
-              <colspec colwidth="25*"/>
+              <colspec colwidth="50*"/>
+              <colspec colwidth="20*"/>
               <colspec colwidth="30*"/>
               <tbody>
                 <row>
@@ -5848,11 +5872,13 @@
                 </row>
                 <row>
                   <entry><literal>innodb_thread_concurrency</literal></entry>
-                  <entry>numeric <literal>GLOBAL</literal></entry>
+                  <entry>numeric</entry>
+                  <entry><literal>GLOBAL</literal></entry>
                 </row>
                 <row>
                   <entry><literal>innodb_thread_sleep_delay</literal></entry>
-                  <entry>numeric <literal>GLOBAL</literal></entry>
+                  <entry>numeric</entry>
+                  <entry><literal>GLOBAL</literal></entry>
                 </row>
                 <row>
                   <entry><literal>insert_id</literal></entry>
@@ -6328,24 +6354,6 @@
             </tgroup>
           </informaltable>
 
-          <para>
-            Variables that are marked as
-            <emphasis role="bold">string</emphasis> take a string value.
-            Variables that are marked as
-            <emphasis role="bold">numeric</emphasis> take a numeric
-            value. Variables that are marked as
-            <emphasis role="bold">boolean</emphasis> can be set to 0, 1,
-            <literal>ON</literal> or <literal>OFF</literal>. Variables
-            that are marked as
-            <emphasis role="bold">enumeration</emphasis> normally should
-            be set to one of the available values for the variable, but
-            can also be set to the number that corresponds to the
-            desired enumeration value. For enumerated system variables,
-            the first enumeration value corresponds to 0. This differs
-            from <literal>ENUM</literal> columns, in which the first
-            enumeration value corresponds to 1.
-          </para>
-
         </refsection>
 
       </refsection>
@@ -6365,15 +6373,11 @@
 
         <para>
           The server maintains many status variables that provide
-          information about its operations. You can view these variables
+          information about its operation. You can view these variables
           and their values by using the <literal>SHOW STATUS</literal>
           statement:
         </para>
 
-        <remark role="todo">
-          Add variables new in 4.1.
-        </remark>
-
 <programlisting>
 mysql&gt; <userinput>SHOW STATUS;</userinput>
 +-----------------------------------+------------+
@@ -6383,16 +6387,12 @@
 | Aborted_connects                  | 0          |
 | Bytes_received                    | 155372598  |
 | Bytes_sent                        | 1176560426 |
-
 ...
-
 | Connections                       | 30023      |
 | Created_tmp_disk_tables           | 0          |
 | Created_tmp_files                 | 3          |
 | Created_tmp_tables                | 2          |
-
 ...
-
 | Threads_created                   | 217        |
 | Threads_running                   | 88         |
 | Uptime                            | 1389872    |
@@ -6433,8 +6433,8 @@
             </para>
 
             <para>
-              The number of tries to connect to the MySQL server that
-              failed. See <xref linkend="communication-errors"/>.
+              The number of failed attempts to connect to the MySQL
+              server. See <xref linkend="communication-errors"/>.
             </para>
           </listitem>
 
@@ -6545,24 +6545,23 @@
             </itemizedlist>
 
             <para>
-              Those variables stand for prepared statements commands.
+              Those variables stand for prepared statement commands.
               Their names refer to the
               <literal>COM_<replaceable>xxx</replaceable></literal>
-              command set used in the network layer; in other words:
-              Their values are increased whenever prepared statements
-              API calls such as <command>mysql_stmt_prepare()</command>,
+              command set used in the network layer. In other words,
+              their values increase whenever prepared statement API
+              calls such as <command>mysql_stmt_prepare()</command>,
               <command>mysql_stmt_execute()</command>, and so forth are
               executed. However, <literal>Com_stmt_prepare</literal>,
               <literal>Com_stmt_execute</literal> and
-              <literal>Com_stmt_close</literal> are also increased when
-              one issues the following SQL statements:
+              <literal>Com_stmt_close</literal> also increase for
               <literal>PREPARE</literal>, <literal>EXECUTE</literal>, or
-              <literal>DEALLOCATE PREPARE</literal> respectively.
+              <literal>DEALLOCATE PREPARE</literal>, respectively.
               Additionally, the values of the older (available since
               MySQL 4.1.3) statement counter variables
               <literal>Com_prepare_sql</literal>,
               <literal>Com_execute_sql</literal>, and
-              <literal>Com_dealloc_sql</literal> are increased for the
+              <literal>Com_dealloc_sql</literal> increase for the
               <literal>PREPARE</literal>, <literal>EXECUTE</literal>,
               and <literal>DEALLOCATE PREPARE</literal> statements.
               <literal>Com_stmt_fetch</literal> stands for the total
@@ -6633,8 +6632,8 @@
             <para>
               The number of in-memory temporary tables created
               automatically by the server while executing statements. If
-              <literal>Created_tmp_disk_tables</literal> is big, you may
-              want to increase the <literal>tmp_table_size</literal>
+              <literal>Created_tmp_disk_tables</literal> is large, you
+              may want to increase the <literal>tmp_table_size</literal>
               value to cause temporary tables to be memory-based instead
               of disk-based.
             </para>
@@ -6729,8 +6728,8 @@
 
             <para>
               The number of times the first entry was read from an
-              index. If this is high, it suggests that the server is
-              doing a lot of full index scans; for example,
+              index. If this value is high, it suggests that the server
+              is doing a lot of full index scans; for example,
               <literal>SELECT col1 FROM foo</literal>, assuming that
               <literal>col1</literal> is indexed.
             </para>
@@ -6743,8 +6742,8 @@
 
             <para>
               The number of requests to read a row based on a key. If
-              this is high, it is a good indication that your queries
-              and tables are properly indexed.
+              this value is high, it is a good indication that your
+              tables are properly indexed for your queries.
             </para>
           </listitem>
 
@@ -6755,8 +6754,9 @@
 
             <para>
               The number of requests to read the next row in key order.
-              This is incremented if you are querying an index column
-              with a range constraint or if you are doing an index scan.
+              This value is incremented if you are querying an index
+              column with a range constraint or if you are doing an
+              index scan.
             </para>
           </listitem>
 
@@ -6779,10 +6779,10 @@
 
             <para>
               The number of requests to read a row based on a fixed
-              position. This is high if you are doing a lot of queries
-              that require sorting of the result. You probably have a
-              lot of queries that require MySQL to scan whole tables or
-              you have joins that don't use keys properly.
+              position. This value is high if you are doing a lot of
+              queries that require sorting of the result. You probably
+              have a lot of queries that require MySQL to scan entire
+              tables or you have joins that don't use keys properly.
             </para>
           </listitem>
 
@@ -6793,10 +6793,10 @@
 
             <para>
               The number of requests to read the next row in the data
-              file. This is high if you are doing a lot of table scans.
-              Generally this suggests that your tables are not properly
-              indexed or that your queries are not written to take
-              advantage of the indexes you have.
+              file. This value is high if you are doing a lot of table
+              scans. Generally this suggests that your tables are not
+              properly indexed or that your queries are not written to
+              take advantage of the indexes you have.
             </para>
           </listitem>
 
@@ -6858,8 +6858,8 @@
             </para>
 
             <para>
-              The number of buffer pool pages that have been requested
-              to be flushed. Added in MySQL 5.0.2.
+              The number of buffer pool page-flush requests. Added in
+              MySQL 5.0.2.
             </para>
           </listitem>
 
@@ -9625,7 +9625,7 @@
 
             <listitem>
               <para>
-                <option>--timezone=<replaceable>zone</replaceable></option>
+                <option>--timezone=<replaceable>timezone</replaceable></option>
               </para>
 
               <para>
@@ -12198,13 +12198,13 @@
           </para>
 
           <para>
-            If this is enabled, a user cannot create new users with the
-            <literal>GRANT</literal> statement unless the user has the
-            <literal>INSERT</literal> privilege for the
+            If this is enabled, a user cannot create new users by using
+            the <literal>GRANT</literal> statement unless the user has
+            the <literal>INSERT</literal> privilege for the
             <literal>mysql.user</literal> table. If you want a user to
-            have the ability to create new users with those privileges
-            that the user has right to grant, you should grant the user
-            the following privilege:
+            have the ability to create new users that have those
+            privileges that the user has right to grant, you should
+            grant the user the following privilege:
           </para>
 
 <programlisting>
@@ -12228,6 +12228,13 @@
             Disallow authentication for accounts that have old (pre-4.1)
             passwords.
           </para>
+
+          <para>
+            The <command>mysql</command> client also has a
+            <option>--secure-auth</option> option, which prevents
+            connections to a server if the server requires a password in
+            old format for the client account.
+          </para>
         </listitem>
 
         <listitem>
@@ -13820,9 +13827,9 @@
         <listitem>
           <para>
             The <literal>GRANT</literal> privilege enables users to give
-            their privileges to other users. Two users with different
-            privileges and with the <literal>GRANT</literal> privilege
-            are able to combine privileges.
+            their privileges to other users. Two users that have
+            different privileges and with the <literal>GRANT</literal>
+            privilege are able to combine privileges.
           </para>
         </listitem>
 
@@ -21569,6 +21576,7 @@
             The system time zone. When the server starts, it attempts to
             determine the time zone of the host machine and uses it to
             set the <literal>system_time_zone</literal> system variable.
+            The value does not change thereafter.
           </para>
         </listitem>
 
@@ -21577,9 +21585,10 @@
             The server's current time zone. The global
             <literal>time_zone</literal> system variable indicates the
             time zone the server currently is operating in. The initial
-            value is <literal>'SYSTEM'</literal>, which indicates that
-            the server time zone is the same as the system time zone.
-            The initial value can be specified explicitly with the
+            value for <literal>time_zone</literal> is
+            <literal>'SYSTEM'</literal>, which indicates that the server
+            time zone is the same as the system time zone. The initial
+            value can be specified explicitly with the
             <option>--default-time-zone=<replaceable>timezone</replaceable></option>
             option. If you have the <literal>SUPER</literal> privilege,
             you can set the global value at runtime with this statement:
@@ -21594,9 +21603,10 @@
           <para>
             Per-connection time zones. Each client that connects has its
             own time zone setting, given by the session
-            <literal>time_zone</literal> variable. Initially this is the
-            same as the global <literal>time_zone</literal> variable,
-            but can be reset with this statement:
+            <literal>time_zone</literal> variable. Initially, the
+            session variable takes its value from the global
+            <literal>time_zone</literal> variable, but the client can
+            change its own time zone with this statement:
           </para>
 
 <programlisting>
@@ -21607,7 +21617,7 @@
       </itemizedlist>
 
       <para>
-        The current values of the global and per-connection time zones
+        The current values of the global and client-specific time zones
         can be retrieved like this:
       </para>
 
@@ -21619,13 +21629,13 @@
         <replaceable>timezone</replaceable> values can be given as
         strings indicating an offset from UTC, such as
         <literal>'+10:00'</literal> or <literal>'-6:00'</literal>. If
-        the time zone-related tables in the <literal>mysql</literal>
+        the time zone information tables in the <literal>mysql</literal>
         database have been created and populated, you can also used
         named time zones, such as <literal>'Europe/Helsinki'</literal>,
         <literal>'US/Eastern'</literal>, or <literal>'MET'</literal>.
-        The value <literal>'SYSTEM'</literal> indicates that the time
-        zone should be the same as the system time zone. Time zone names
-        are not case sensitive.
+        The value <literal>'SYSTEM'</literal> can be used to indicate
+        that the time zone should be the same as the system time zone.
+        Time zone names are not case sensitive.
       </para>
 
       <para>
@@ -21670,31 +21680,39 @@
       <para>
         <command>mysql_tzinfo_to_sql</command> also can be used to load
         a single time zone file, and to generate leap second
-        information.
+        information:
       </para>
 
-      <para>
-        To load a single time zone file
-        <replaceable>tz_file</replaceable> that corresponds to a time
-        zone name <replaceable>tz_name</replaceable>, invoke
-        <command>mysql_tzinfo_to_sql</command> like this:
-      </para>
+      <itemizedlist>
 
+        <listitem>
+          <para>
+            To load a single time zone file
+            <replaceable>tz_file</replaceable> that corresponds to a
+            time zone name <replaceable>tz_name</replaceable>, invoke
+            <command>mysql_tzinfo_to_sql</command> like this:
+          </para>
+
 <programlisting>
 shell&gt; <userinput>mysql_tzinfo_to_sql <replaceable>tz_file</replaceable> <replaceable>tz_name</replaceable> | mysql -u root mysql</userinput>
 </programlisting>
+        </listitem>
 
-      <para>
-        If your time zone needs to account for leap seconds, initialize
-        the leap second information like this, where
-        <replaceable>tz_file</replaceable> is the name of your time zone
-        file:
-      </para>
+        <listitem>
+          <para>
+            If your time zone needs to account for leap seconds,
+            initialize the leap second information like this, where
+            <replaceable>tz_file</replaceable> is the name of your time
+            zone file:
+          </para>
 
 <programlisting>
 shell&gt; <userinput>mysql_tzinfo_to_sql --leap <replaceable>tz_file</replaceable> | mysql -u root mysql</userinput>
 </programlisting>
+        </listitem>
 
+      </itemizedlist>
+
       <para>
         If your system doesn't have a zoneinfo database (for example,
         Windows or HP-UX), you can use the package of pre-built time
@@ -21703,23 +21721,23 @@
         contains <filename>.frm</filename>, <filename>.MYD</filename>,
         and <filename>.MYI</filename> files for the
         <literal>MyISAM</literal> time zone tables. These tables should
-        belong to the <literal>mysql</literal> database, so you should
+        be part of the <literal>mysql</literal> database, so you should
         place the files in the <filename>mysql</filename> subdirectory
-        of your MySQL server's data directory. The server should be shut
-        down while you do this.
+        of your MySQL server's data directory. The server should be
+        stopped while you do this.
       </para>
 
       <para>
-        <emphasis role="bold">Warning!</emphasis> Please don't use the
+        <emphasis role="bold">Warning</emphasis>: Please don't use the
         downloadable package if your system has a zoneinfo database. Use
-        the <command>mysql_tzinfo_to_sql</command> utility instead!
+        the <command>mysql_tzinfo_to_sql</command> utility instead.
         Otherwise, you may cause a difference in datetime handling
         between MySQL and other applications on your system.
       </para>
 
       <para>
-        For information about time zone settings in replication setup
-        please look into <xref linkend="replication-features"/>.
+        For information about time zone settings in replication setup,
+        please see <xref linkend="replication-features"/>.
       </para>
 
     </section>

Modified: trunk/refman-5.0/problems.xml
===================================================================
--- trunk/refman-5.0/problems.xml	2006-01-27 23:06:29 UTC (rev 1071)
+++ trunk/refman-5.0/problems.xml	2006-01-27 23:52:05 UTC (rev 1072)
@@ -2582,8 +2582,7 @@
             the same data directory on a system that doesn't support
             good filesystem locks (normally handled by the
             <literal>lockd</literal> lock manager), or you are running
-            multiple servers with the
-            <option>--skip-external-locking</option> option.
+            multiple servers with external locking disabled.
           </para>
         </listitem>
 

Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml	2006-01-27 23:06:29 UTC (rev 1071)
+++ trunk/refman-5.1/charset.xml	2006-01-27 23:52:05 UTC (rev 1072)
@@ -1899,8 +1899,8 @@
       </itemizedlist>
 
       <para>
-        For example, with <literal>CASE &hellip; WHEN a THEN b WHEN b
-        THEN c COLLATE <replaceable>X</replaceable> END</literal>, the
+        For example, with <literal>CASE ... WHEN a THEN b WHEN b THEN c
+        COLLATE <replaceable>X</replaceable> END</literal>, the
         resulting collation is <replaceable>X</replaceable>. The same
         applies for <literal>CASE</literal>, <literal>UNION</literal>,
         <literal>||</literal>, <literal>CONCAT()</literal>,
@@ -1949,8 +1949,8 @@
 </programlisting>
 
       <para>
-        <literal>CONVERT(&hellip; USING &hellip;)</literal> is
-        implemented according to the standard SQL specification.
+        <literal>CONVERT(... USING ...)</literal> is implemented
+        according to the standard SQL specification.
       </para>
 
       <para>
@@ -1985,8 +1985,8 @@
       <para>
         You may not use a <literal>COLLATE</literal> clause inside a
         <literal>CAST()</literal>, but you may use it outside. That is,
-        <literal>CAST(&hellip; COLLATE &hellip;)</literal> is illegal,
-        but <literal>CAST(&hellip;) COLLATE &hellip;</literal> is legal.
+        <literal>CAST(... COLLATE ...)</literal> is illegal, but
+        <literal>CAST(...) COLLATE ...</literal> is legal.
       </para>
 
       <para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-27 23:06:29 UTC (rev 1071)
+++ trunk/refman-5.1/database-administration.xml	2006-01-27 23:52:05 UTC (rev 1072)
@@ -759,7 +759,7 @@
 
           <listitem>
             <para>
-              <option>--default-time-zone=<replaceable>zone</replaceable></option>
+              <option>--default-time-zone=<replaceable>timezone</replaceable></option>
             </para>
 
             <para>
@@ -1451,11 +1451,11 @@
             </para>
 
             <para>
-              If this is enabled, a user can't create new users with the
-              <literal>GRANT</literal> statement, if the user doesn't
-              have the <literal>INSERT</literal> privilege for the
-              <literal>mysql.user</literal> table or any column in the
-              table.
+              If this is enabled, a user can't create new users by using
+              the <literal>GRANT</literal> statement, if the user
+              doesn't have the <literal>INSERT</literal> privilege for
+              the <literal>mysql.user</literal> table or any column in
+              the table.
             </para>
           </listitem>
 
@@ -4348,8 +4348,8 @@
             </para>
 
             <para>
-              After this many write locks, allow some read locks to run
-              in between.
+              After this many write locks, allow some pending read lock
+              requests to be processed in between.
             </para>
           </listitem>
 
@@ -4392,7 +4392,7 @@
               use while re-creating a <literal>MyISAM</literal> index
               (during <literal>REPAIR TABLE</literal>, <literal>ALTER
               TABLE</literal>, or <literal>LOAD DATA INFILE</literal>).
-              If the file size would be bigger than this value, the
+              If the file size would be larger than this value, the
               index is created using the key cache instead, which is
               slower. The value is given in bytes.
             </para>
@@ -4405,6 +4405,7 @@
 
             <para>
               The value of the <option>--myisam-recover</option> option.
+              See <xref linkend="server-options"/>.
             </para>
           </listitem>
 
@@ -4429,7 +4430,7 @@
             </para>
 
             <para>
-              The buffer that is allocated when sorting
+              The size of the buffer that is allocated when sorting
               <literal>MyISAM</literal> indexes during a <literal>REPAIR
               TABLE</literal> or when creating indexes with
               <literal>CREATE INDEX</literal> or <literal>ALTER
@@ -4525,8 +4526,8 @@
 
             <para>
               The communication buffer is reset to this size between SQL
-              statements. This should not normally be changed, but if
-              you have very little memory, you can set it to the
+              statements. This variable should not normally be changed,
+              but if you have very little memory, you can set it to the
               expected length of statements sent by clients. If
               statements exceed this length, the buffer is automatically
               enlarged, up to <literal>max_allowed_packet</literal>
@@ -4541,8 +4542,10 @@
 
             <para>
               The number of seconds to wait for more data from a
-              connection before aborting the read. When the server is
-              reading from the client,
+              connection before aborting the read. This timeout applies
+              only to TCP/IP connections, not to connections made via
+              Unix socket files, named pipes, or shared memory. When the
+              server is reading from the client,
               <literal>net_read_timeout</literal> is the timeout value
               controlling when to abort. When the server is writing to
               the client, <literal>net_write_timeout</literal> is the
@@ -4571,8 +4574,10 @@
 
             <para>
               The number of seconds to wait for a block to be written to
-              a connection before aborting the write. See also
-              <literal>net_read_timeout</literal>.
+              a connection before aborting the write. This timeout
+              applies only to TCP/IP connections, not to connections
+              made via Unix socket files, named pipes, or shared memory.
+              See also <literal>net_read_timeout</literal>.
             </para>
           </listitem>
 
@@ -4607,25 +4612,13 @@
 
             <para>
               This is not a variable, but it can be used when setting
-              some variables. It's described in
+              some variables. It is described in
               <xref linkend="set-option"/>.
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>one_shot</literal>
-            </para>
-
-            <para>
-              This is not a variable, but it can be used when setting
-              some variables. It's described in
-              <xref linkend="set-option"/>.
-            </para>
-          </listitem>
-
-          <listitem>
-            <para>
               <literal>open_files_limit</literal>
             </para>
 
@@ -4633,9 +4626,11 @@
               The number of files that the operating system allows
               <command>mysqld</command> to open. This is the real value
               allowed by the system and might be different from the
-              value you gave <command>mysqld</command> as a startup
-              option. The value is 0 on systems where MySQL can't change
-              the number of open files.
+              value you gave using the
+              <option>--open-files-limit</option> option to
+              <command>mysqld</command> or
+              <command>mysqld_safe</command>. The value is 0 on systems
+              where MySQL can't change the number of open files.
             </para>
           </listitem>
 
@@ -4691,8 +4686,8 @@
             </para>
 
             <para>
-              The path to the plugins directory. This variable was added
-              in MySQL 5.1.2.
+              The pathname of the plugins directory. This variable was
+              added in MySQL 5.1.2.
             </para>
           </listitem>
 
@@ -4702,8 +4697,8 @@
             </para>
 
             <para>
-              The port on which the server listens for TCP/IP
-              connections. This variable can be set with the
+              The number of the port on which the server listens for
+              TCP/IP connections. This variable can be set with the
               <option>--port</option> option.
             </para>
           </listitem>
@@ -4754,7 +4749,7 @@
 
             <para>
               Don't cache results that are larger than this number of
-              bytes. The default value is 1048576 (1MB).
+              bytes. The default value is 1MB.
             </para>
           </listitem>
 
@@ -4792,7 +4787,7 @@
             </para>
 
             <para>
-              Set query cache type. Setting the
+              Set the query cache type. Setting the
               <literal>GLOBAL</literal> value sets the type for all
               clients that connect thereafter. Individual clients can
               set the <literal>SESSION</literal> value to affect their
@@ -4843,9 +4838,9 @@
               Normally, when one client acquires a
               <literal>WRITE</literal> lock on a
               <literal>MyISAM</literal> table, other clients are not
-              blocked from issuing queries for the table if the query
-              results are present in the query cache. Setting this
-              variable to 1 causes acquisition of a
+              blocked from issuing statements that read from the table
+              if the query results are present in the query cache.
+              Setting this variable to 1 causes acquisition of a
               <literal>WRITE</literal> lock for a table to invalidate
               any queries in the query cache that refer to the table.
               This forces other clients that attempt to access the table
@@ -4907,11 +4902,11 @@
             <para>
               When the variable is set to <literal>ON</literal> for a
               replication slave server, it causes the slave to allow no
-              updates except from slave threads or from users with the
-              <literal>SUPER</literal> privilege. This can be useful to
-              ensure that a slave server accepts no updates from
-              clients. This variable does not apply to
-              <literal>TEMPORARY</literal> tables.
+              updates except from slave threads or from users that have
+              the <literal>SUPER</literal> privilege. This can be useful
+              to ensure that a slave server accepts updates only from
+              its master server and not from clients. This variable does
+              not apply to <literal>TEMPORARY</literal> tables.
             </para>
           </listitem>
 
@@ -4921,9 +4916,9 @@
             </para>
 
             <para>
-              Disables or enables automatic purging of relay logs as
-              soon as they are not needed any more. The default value is
-              1 (enabled).
+              Disables or enables automatic purging of relay log files
+              as soon as they are not needed any more. The default value
+              is 1 (<literal>ON</literal>).
             </para>
           </listitem>
 
@@ -4933,14 +4928,14 @@
             </para>
 
             <para>
-              When reading rows in sorted order after a sort, the rows
-              are read through this buffer to avoid disk seeks. Setting
-              the variable to a large value can improve <literal>ORDER
-              BY</literal> performance by a lot. However, this is a
-              buffer allocated for each client, so you should not set
-              the global variable to a large value. Instead, change the
-              session variable only from within those clients that need
-              to run large queries.
+              When reading rows in sorted order following a key-sorting
+              operation, the rows are read through this buffer to avoid
+              disk seeks. Setting the variable to a large value can
+              improve <literal>ORDER BY</literal> performance by a lot.
+              However, this is a buffer allocated for each client, so
+              you should not set the global variable to a large value.
+              Instead, change the session variable only from within
+              those clients that need to run large queries.
             </para>
           </listitem>
 
@@ -4960,7 +4955,7 @@
 
             <para>
               You should enable this option if you want to prevent all
-              usage of passwords employing the old format (and hence
+              use of passwords employing the old format (and hence
               insecure communication over the network).
             </para>
 
@@ -4969,17 +4964,6 @@
               enabled and the privilege tables are in pre-4.1 format.
               See <xref linkend="old-client"/>.
             </para>
-
-            <remark role="todo">
-              this doesn't really belong here in a discussion of server
-              variables
-            </remark>
-
-            <para>
-              When used as a client-side option, the client refuses to
-              connect to a server if the server requires a password in
-              old format for the client account.
-            </para>
           </listitem>
 
           <listitem>
@@ -4988,8 +4972,10 @@
             </para>
 
             <para>
-              The value of the <option>--server-id</option> option. It
-              is used for master and slave replication servers.
+              The server ID. This value is set by the
+              <option>--server-id</option> option. It is used for
+              replication to enable master and slave servers to identify
+              themselves uniquely.
             </para>
           </listitem>
 
@@ -5020,12 +5006,22 @@
 
           <listitem>
             <para>
+              <indexterm>
+                <primary>external locking</primary>
+              </indexterm>
+
+              <indexterm>
+                <primary>locking</primary>
+                <secondary>external</secondary>
+              </indexterm>
+
               <literal>skip_external_locking</literal>
             </para>
 
             <para>
               This is <literal>OFF</literal> if
-              <command>mysqld</command> uses external locking.
+              <command>mysqld</command> uses external locking,
+              <literal>ON</literal> if external locking is disabled.
             </para>
           </listitem>
 
@@ -5040,7 +5036,9 @@
               use a Unix socket file. On Windows, local connections use
               a named pipe or shared memory. On NetWare, only TCP/IP
               connections are supported, so do not set this variable to
-              <literal>ON</literal>.
+              <literal>ON</literal>. This variable can be set to
+              <literal>ON</literal> with the
+              <option>--skip-networking</option> option.
             </para>
           </listitem>
 
@@ -5087,7 +5085,7 @@
             <para>
               The name of the directory where the slave creates
               temporary files for replicating <literal>LOAD DATA
-              INFILE</literal> statement.
+              INFILE</literal> statements.
             </para>
           </listitem>
 
@@ -5098,7 +5096,10 @@
 
             <para>
               The number of seconds to wait for more data from a
-              master/slave connection before aborting the read.
+              master/slave connection before aborting the read. This
+              timeout applies only to TCP/IP connections, not to
+              connections made via Unix socket files, named pipes, or
+              shared memory.
             </para>
           </listitem>
 
@@ -5150,15 +5151,17 @@
             </para>
 
             <para>
-              <emphasis>Unix platforms</emphasis>: The socket file used
-              for local client connections. Defaults to
-              <filename>/var/lib/mysql/mysql.sock</filename>.
+              On Unix platforms, this variable is the name of the socket
+              file that is used for local client connections. The
+              default is <filename>/tmp/mysql.sock</filename>. (For some
+              distribution formats, the directory might be different,
+              such as <filename>/var/lib/mysql</filename> for RPMs.)
             </para>
 
             <para>
-              <emphasis>Windows</emphasis>: The name of the named pipe
-              used for local client connections. The default value is
-              <literal>MySQL</literal> (not case sensitive).
+              On Windows, this variable is the name of the named pipe
+              that is used for local client connections. The default
+              value is <literal>MySQL</literal> (not case sensitive).
             </para>
           </listitem>
 
@@ -5193,7 +5196,8 @@
 
             <para>
               The number of events from the master that a slave server
-              should skip.
+              should skip. See
+              <xref linkend="set-global-sql-slave-skip-counter"/>.
             </para>
           </listitem>
 
@@ -5203,12 +5207,6 @@
             </para>
 
             <para>
-              This variable is a synonym for
-              <literal>table_type</literal>. In MySQL &current-series;,
-              <literal>storage_engine</literal> is the preferred name.
-            </para>
-
-            <para>
               The default storage engine (table type). To set the
               storage engine at server startup, use the
               <option>--default-storage-engine</option> option. See
@@ -5223,16 +5221,16 @@
 
             <para>
               If the value of this variable is positive, the MySQL
-              server synchronizes its binary log to disk
-              (<literal>fdatasync()</literal>) after every
-              <literal>sync_binlog</literal>'th write to this binary
-              log. Note that there is one write to the binary log per
-              statement if in autocommit mode, and otherwise one write
-              per transaction. The default value is 0 which does no
-              synchronizing to disk. A value of 1 is the safest choice,
-              because in the event of a crash you lose at most one
-              statement/transaction from the binary log; however, it is
-              also the slowest choice (unless the disk has a
+              server synchronizes its binary log to disk (using
+              <literal>fdatasync()</literal>) after every
+              <literal>sync_binlog</literal> writes to the binary log.
+              Note that there is one write to the binary log per
+              statement if autocommit is enabled, and one write per
+              transaction otherwise. The default value is 0, which does
+              no synchronizing to disk. A value of 1 is the safest
+              choice, because in the event of a crash you lose at most
+              one statement or transaction from the binary log. However,
+              it is also the slowest choice (unless the disk has a
               battery-backed cache, which makes synchronization very
               fast).
             </para>
@@ -5244,11 +5242,11 @@
             </para>
 
             <para>
-              If this variable is set to 1, then when a non-temporary
-              table is created its <filename>.frm</filename> file is
-              synchronized to disk (<literal>fdatasync()</literal>);
-              this is slower but safer in case of a crash. The default
-              is 1.
+              If this variable is set to 1, when any non-temporary table
+              is created its <filename>.frm</filename> file is
+              synchronized to disk (using
+              <literal>fdatasync()</literal>). This is slower but safer
+              in case of a crash. The default is 1.
             </para>
           </listitem>
 
@@ -5269,6 +5267,14 @@
               <option>--timezone</option> option of the
               <command>mysqld_safe</command> script.
             </para>
+
+            <para>
+              The <literal>system_time_zone</literal> variable differs
+              from <literal>time_zone</literal>. Although they might
+              have the same value, the latter variable is used to
+              initialize the tome zone for each client that connects.
+              See <xref linkend="time-zone-support"/>.
+            </para>
           </listitem>
 
           <listitem>
@@ -5279,6 +5285,8 @@
             <para>
               This is the old name of
               <literal>table_open_cache</literal> before MySQL 5.1.3.
+              From 5.1.3 on, use <literal>table_open_cache</literal>
+              instead.
             </para>
           </listitem>
 
@@ -5288,12 +5296,12 @@
             </para>
 
             <para>
-              The table definition cache. If you use a large number of
-              tables, you can create a large table definition cache to
-              speed up opening of tables. The table definition cache
-              takes less space and does not use file descriptors, unlike
-              the normal table cache. This variable was added in MySQL
-              5.1.3.
+              The number of table definitions that can be stored in the
+              definition cache. If you use a large number of tables, you
+              can create a large table definition cache to speed up
+              opening of tables. The table definition cache takes less
+              space and does not use file descriptors, unlike the normal
+              table cache. This variable was added in MySQL 5.1.3.
             </para>
           </listitem>
 
@@ -5313,13 +5321,11 @@
               <literal>FLUSH TABLES</literal> a lot (which just forces
               all tables to be closed and reopened), then you should
               increase the value of the
-              <literal>table_open_cache</literal> variable.
+              <literal>table_open_cache</literal> variable. For more
+              information about the table cache, see
+              <xref linkend="table-cache"/>. Before MySQL 5.1.3, this
+              variable is called <literal>table_cache</literal>.
             </para>
-
-            <para>
-              For more information about the table cache, see
-              <xref linkend="table-cache"/>.
-            </para>
           </listitem>
 
           <listitem>
@@ -5349,13 +5355,13 @@
               taken from the cache if possible, and only when the cache
               is empty is a new thread created. This variable can be
               increased to improve performance if you have a lot of new
-              connections. (Normally this doesn't give a notable
+              connections. (Normally this doesn't provide a notable
               performance improvement if you have a good thread
               implementation.) By examining the difference between the
               <literal>Connections</literal> and
-              <literal>Threads_created</literal> status variables (see
-              <xref linkend="server-status-variables"/>, for details)
-              you can see how efficient the thread cache is.
+              <literal>Threads_created</literal> status variables, you
+              can see how efficient the thread cache is. For details,
+              see <xref linkend="server-status-variables"/>.
             </para>
           </listitem>
 
@@ -5403,11 +5409,14 @@
             </para>
 
             <para>
-              The current time zone. The initial value of this is
-              <literal>'SYSTEM'</literal> (use the value of
-              <literal>system_time_zone</literal>), but can be specified
-              explicitly at server startup time with the
-              <option>--default-time-zone</option> option.
+              The current time zone. This variable is used to initialize
+              the tome zone for each client that connects. By default,
+              the initial value of this is <literal>'SYSTEM'</literal>
+              (which means, <quote>use the value of
+              <literal>system_time_zone</literal></quote>). The value
+              can be specified explicitly at server startup with the
+              <option>--default-time-zone</option> option. See
+              <xref linkend="time-zone-support"/>.
             </para>
           </listitem>
 
@@ -5442,9 +5451,9 @@
             </para>
 
             <para>
-              This feature can be used to spread the load between
-              several physical disks. If the MySQL server is acting as a
-              replication slave, you should not set
+              The multiple-directory feature can be used to spread the
+              load between several physical disks. If the MySQL server
+              is acting as a replication slave, you should not set
               <literal>tmpdir</literal> to point to a directory on a
               memory-based filesystem or to a directory that is cleared
               when the server host restarts. A replication slave needs
@@ -5452,13 +5461,12 @@
               so that it can replicate temporary tables or <literal>LOAD
               DATA INFILE</literal> operations. If files in the
               temporary file directory are lost when the server
-              restarts, replication fails. However, if you're using
-              MySQL 4.0.0 or later, you may set the slave's temporary
+              restarts, replication fails. However, if you are using
+              MySQL 4.0.0 or later, you can set the slave's temporary
               directory using the <literal>slave_load_tmpdir</literal>
               variable. In that case, the slave won't use the general
-              <literal>tmpdir</literal> any more, which means you can
-              set <literal>tmpdir</literal> to a non-permanent location
-              then.
+              <literal>tmpdir</literal> value and you can set
+              <literal>tmpdir</literal> to a non-permanent location.
             </para>
           </listitem>
 
@@ -5514,10 +5522,10 @@
               This variable is set by the <literal>SET TRANSACTION
               ISOLATION LEVEL</literal> statement. See
               <xref linkend="set-transaction"/>. If you set
-              <literal>tx_isolation</literal> level directly to an
-              isolation level name that contains a space, the name
-              should be enclosed within quotes, with the space replaced
-              by a dash. For example:
+              <literal>tx_isolation</literal> directly to an isolation
+              level name that contains a space, the name should be
+              enclosed within quotes, with the space replaced by a dash.
+              For example:
             </para>
 
 <programlisting>
@@ -5605,8 +5613,8 @@
             </para>
 
             <para>
-              The type of machine or architecture which MySQL was built
-              on.
+              The type of machine or architecture on which MySQL was
+              built.
             </para>
           </listitem>
 
@@ -5616,7 +5624,7 @@
             </para>
 
             <para>
-              The type of operating system MySQL was built on.
+              The type of operating system on which MySQL was built.
             </para>
           </listitem>
 
@@ -5628,9 +5636,8 @@
             <para>
               The number of seconds the server waits for activity on a
               non-interactive connection before closing it. This timeout
-              applies to TCP/IP connections only. It does not apply to
-              connections made via Unix socket files, named pipes, or
-              shared memory.
+              applies only to TCP/IP connections, not to connections
+              made via Unix socket files, named pipes, or shared memory.
             </para>
 
             <para>
@@ -5663,13 +5670,33 @@
             The following table shows the full list of all dynamic
             system variables. The last column indicates for each
             variable whether <literal>GLOBAL</literal> or
-            <literal>SESSION</literal> (or both) apply.
+            <literal>SESSION</literal> (or both) apply. The table also
+            lists session options that can be set with the
+            <literal>SET</literal> statement.
+            <xref linkend="set-option"/>, discusses these options.
           </para>
 
+          <para>
+            Variables that have a type of <quote>string</quote> take a
+            string value. Variables that have a type of
+            <quote>numeric</quote> take a numeric value. Variables that
+            have a type of <quote>boolean</quote> can be set to 0, 1,
+            <literal>ON</literal> or <literal>OFF</literal>. (If you set
+            them on the command line or in an option file, use the
+            numeric values.) Variables that are marked as
+            <quote>enumeration</quote> normally should be set to one of
+            the available values for the variable, but can also be set
+            to the number that corresponds to the desired enumeration
+            value. For enumerated system variables, the first
+            enumeration value corresponds to 0. This differs from
+            <literal>ENUM</literal> columns, for which the first
+            enumeration value corresponds to 1.
+          </para>
+
           <informaltable>
             <tgroup cols="3">
-              <colspec colwidth="45*"/>
-              <colspec colwidth="25*"/>
+              <colspec colwidth="50*"/>
+              <colspec colwidth="20*"/>
               <colspec colwidth="30*"/>
               <tbody>
                 <row>
@@ -5916,11 +5943,13 @@
                 </row>
                 <row>
                   <entry><literal>innodb_thread_concurrency</literal></entry>
-                  <entry>numeric <literal>GLOBAL</literal></entry>
+                  <entry>numeric</entry>
+                  <entry><literal>GLOBAL</literal></entry>
                 </row>
                 <row>
                   <entry><literal>innodb_thread_sleep_delay</literal></entry>
-                  <entry>numeric <literal>GLOBAL</literal></entry>
+                  <entry>numeric</entry>
+                  <entry><literal>GLOBAL</literal></entry>
                 </row>
                 <row>
                   <entry><literal>insert_id</literal></entry>
@@ -6411,24 +6440,6 @@
             </tgroup>
           </informaltable>
 
-          <para>
-            Variables that are marked as
-            <emphasis role="bold">string</emphasis> take a string value.
-            Variables that are marked as
-            <emphasis role="bold">numeric</emphasis> take a numeric
-            value. Variables that are marked as
-            <emphasis role="bold">boolean</emphasis> can be set to 0, 1,
-            <literal>ON</literal> or <literal>OFF</literal>. Variables
-            that are marked as
-            <emphasis role="bold">enumeration</emphasis> normally should
-            be set to one of the available values for the variable, but
-            can also be set to the number that corresponds to the
-            desired enumeration value. For enumerated system variables,
-            the first enumeration value corresponds to 0. This differs
-            from <literal>ENUM</literal> columns, in which the first
-            enumeration value corresponds to 1.
-          </para>
-
         </refsection>
 
       </refsection>
@@ -6448,15 +6459,11 @@
 
         <para>
           The server maintains many status variables that provide
-          information about its operations. You can view these variables
+          information about its operation. You can view these variables
           and their values by using the <literal>SHOW STATUS</literal>
           statement:
         </para>
 
-        <remark role="todo">
-          Add variables new in 4.1.
-        </remark>
-
 <programlisting>
 mysql&gt; <userinput>SHOW STATUS;</userinput>
 +-----------------------------------+------------+
@@ -6466,16 +6473,12 @@
 | Aborted_connects                  | 0          |
 | Bytes_received                    | 155372598  |
 | Bytes_sent                        | 1176560426 |
-
 ...
-
 | Connections                       | 30023      |
 | Created_tmp_disk_tables           | 0          |
 | Created_tmp_files                 | 3          |
 | Created_tmp_tables                | 2          |
-
 ...
-
 | Threads_created                   | 217        |
 | Threads_running                   | 88         |
 | Uptime                            | 1389872    |
@@ -6516,8 +6519,8 @@
             </para>
 
             <para>
-              The number of tries to connect to the MySQL server that
-              failed. See <xref linkend="communication-errors"/>.
+              The number of failed attempts to connect to the MySQL
+              server. See <xref linkend="communication-errors"/>.
             </para>
           </listitem>
 
@@ -6628,24 +6631,23 @@
             </itemizedlist>
 
             <para>
-              Those variables stand for prepared statements commands.
+              Those variables stand for prepared statement commands.
               Their names refer to the
               <literal>COM_<replaceable>xxx</replaceable></literal>
-              command set used in the network layer; in other words:
-              Their values are increased whenever prepared statements
-              API calls such as <command>mysql_stmt_prepare()</command>,
+              command set used in the network layer. In other words,
+              their values increase whenever prepared statement API
+              calls such as <command>mysql_stmt_prepare()</command>,
               <command>mysql_stmt_execute()</command>, and so forth are
               executed. However, <literal>Com_stmt_prepare</literal>,
               <literal>Com_stmt_execute</literal> and
-              <literal>Com_stmt_close</literal> are also increased when
-              one issues the following SQL statements:
+              <literal>Com_stmt_close</literal> also increase for
               <literal>PREPARE</literal>, <literal>EXECUTE</literal>, or
-              <literal>DEALLOCATE PREPARE</literal> respectively.
+              <literal>DEALLOCATE PREPARE</literal>, respectively.
               Additionally, the values of the older (available since
               MySQL 4.1.3) statement counter variables
               <literal>Com_prepare_sql</literal>,
               <literal>Com_execute_sql</literal>, and
-              <literal>Com_dealloc_sql</literal> are increased for the
+              <literal>Com_dealloc_sql</literal> increase for the
               <literal>PREPARE</literal>, <literal>EXECUTE</literal>,
               and <literal>DEALLOCATE PREPARE</literal> statements.
               <literal>Com_stmt_fetch</literal> stands for the total
@@ -6716,8 +6718,8 @@
             <para>
               The number of in-memory temporary tables created
               automatically by the server while executing statements. If
-              <literal>Created_tmp_disk_tables</literal> is big, you may
-              want to increase the <literal>tmp_table_size</literal>
+              <literal>Created_tmp_disk_tables</literal> is large, you
+              may want to increase the <literal>tmp_table_size</literal>
               value to cause temporary tables to be memory-based instead
               of disk-based.
             </para>
@@ -6812,8 +6814,8 @@
 
             <para>
               The number of times the first entry was read from an
-              index. If this is high, it suggests that the server is
-              doing a lot of full index scans; for example,
+              index. If this value is high, it suggests that the server
+              is doing a lot of full index scans; for example,
               <literal>SELECT col1 FROM foo</literal>, assuming that
               <literal>col1</literal> is indexed.
             </para>
@@ -6826,8 +6828,8 @@
 
             <para>
               The number of requests to read a row based on a key. If
-              this is high, it is a good indication that your queries
-              and tables are properly indexed.
+              this value is high, it is a good indication that your
+              tables are properly indexed for your queries.
             </para>
           </listitem>
 
@@ -6838,8 +6840,9 @@
 
             <para>
               The number of requests to read the next row in key order.
-              This is incremented if you are querying an index column
-              with a range constraint or if you are doing an index scan.
+              This value is incremented if you are querying an index
+              column with a range constraint or if you are doing an
+              index scan.
             </para>
           </listitem>
 
@@ -6862,10 +6865,10 @@
 
             <para>
               The number of requests to read a row based on a fixed
-              position. This is high if you are doing a lot of queries
-              that require sorting of the result. You probably have a
-              lot of queries that require MySQL to scan whole tables or
-              you have joins that don't use keys properly.
+              position. This value is high if you are doing a lot of
+              queries that require sorting of the result. You probably
+              have a lot of queries that require MySQL to scan entire
+              tables or you have joins that don't use keys properly.
             </para>
           </listitem>
 
@@ -6876,10 +6879,10 @@
 
             <para>
               The number of requests to read the next row in the data
-              file. This is high if you are doing a lot of table scans.
-              Generally this suggests that your tables are not properly
-              indexed or that your queries are not written to take
-              advantage of the indexes you have.
+              file. This value is high if you are doing a lot of table
+              scans. Generally this suggests that your tables are not
+              properly indexed or that your queries are not written to
+              take advantage of the indexes you have.
             </para>
           </listitem>
 
@@ -6940,8 +6943,7 @@
             </para>
 
             <para>
-              The number of buffer pool pages that have been requested
-              to be flushed.
+              The number of buffer pool page-flush requests.
             </para>
           </listitem>
 
@@ -9682,7 +9684,7 @@
 
             <listitem>
               <para>
-                <option>--timezone=<replaceable>zone</replaceable></option>
+                <option>--timezone=<replaceable>timezone</replaceable></option>
               </para>
 
               <para>
@@ -12240,13 +12242,13 @@
           </para>
 
           <para>
-            If this is enabled, a user cannot create new users with the
-            <literal>GRANT</literal> statement unless the user has the
-            <literal>INSERT</literal> privilege for the
+            If this is enabled, a user cannot create new users by using
+            the <literal>GRANT</literal> statement unless the user has
+            the <literal>INSERT</literal> privilege for the
             <literal>mysql.user</literal> table. If you want a user to
-            have the ability to create new users with those privileges
-            that the user has right to grant, you should grant the user
-            the following privilege:
+            have the ability to create new users that have those
+            privileges that the user has right to grant, you should
+            grant the user the following privilege:
           </para>
 
 <programlisting>
@@ -12270,6 +12272,13 @@
             Disallow authentication for accounts that have old (pre-4.1)
             passwords.
           </para>
+
+          <para>
+            The <command>mysql</command> client also has a
+            <option>--secure-auth</option> option, which prevents
+            connections to a server if the server requires a password in
+            old format for the client account.
+          </para>
         </listitem>
 
         <listitem>
@@ -13835,9 +13844,9 @@
         <listitem>
           <para>
             The <literal>GRANT</literal> privilege enables users to give
-            their privileges to other users. Two users with different
-            privileges and with the <literal>GRANT</literal> privilege
-            are able to combine privileges.
+            their privileges to other users. Two users that have
+            different privileges and with the <literal>GRANT</literal>
+            privilege are able to combine privileges.
           </para>
         </listitem>
 
@@ -21579,6 +21588,7 @@
             The system time zone. When the server starts, it attempts to
             determine the time zone of the host machine and uses it to
             set the <literal>system_time_zone</literal> system variable.
+            The value does not change thereafter.
           </para>
         </listitem>
 
@@ -21587,9 +21597,10 @@
             The server's current time zone. The global
             <literal>time_zone</literal> system variable indicates the
             time zone the server currently is operating in. The initial
-            value is <literal>'SYSTEM'</literal>, which indicates that
-            the server time zone is the same as the system time zone.
-            The initial value can be specified explicitly with the
+            value for <literal>time_zone</literal> is
+            <literal>'SYSTEM'</literal>, which indicates that the server
+            time zone is the same as the system time zone. The initial
+            value can be specified explicitly with the
             <option>--default-time-zone=<replaceable>timezone</replaceable></option>
             option. If you have the <literal>SUPER</literal> privilege,
             you can set the global value at runtime with this statement:
@@ -21604,9 +21615,10 @@
           <para>
             Per-connection time zones. Each client that connects has its
             own time zone setting, given by the session
-            <literal>time_zone</literal> variable. Initially this is the
-            same as the global <literal>time_zone</literal> variable,
-            but can be reset with this statement:
+            <literal>time_zone</literal> variable. Initially, the
+            session variable takes its value from the global
+            <literal>time_zone</literal> variable, but the client can
+            change its own time zone with this statement:
           </para>
 
 <programlisting>
@@ -21617,7 +21629,7 @@
       </itemizedlist>
 
       <para>
-        The current values of the global and per-connection time zones
+        The current values of the global and client-specific time zones
         can be retrieved like this:
       </para>
 
@@ -21629,13 +21641,13 @@
         <replaceable>timezone</replaceable> values can be given as
         strings indicating an offset from UTC, such as
         <literal>'+10:00'</literal> or <literal>'-6:00'</literal>. If
-        the time zone-related tables in the <literal>mysql</literal>
+        the time zone information tables in the <literal>mysql</literal>
         database have been created and populated, you can also used
         named time zones, such as <literal>'Europe/Helsinki'</literal>,
         <literal>'US/Eastern'</literal>, or <literal>'MET'</literal>.
-        The value <literal>'SYSTEM'</literal> indicates that the time
-        zone should be the same as the system time zone. Time zone names
-        are not case sensitive.
+        The value <literal>'SYSTEM'</literal> can be used to indicate
+        that the time zone should be the same as the system time zone.
+        Time zone names are not case sensitive.
       </para>
 
       <para>
@@ -21680,31 +21692,39 @@
       <para>
         <command>mysql_tzinfo_to_sql</command> also can be used to load
         a single time zone file, and to generate leap second
-        information.
+        information:
       </para>
 
-      <para>
-        To load a single time zone file
-        <replaceable>tz_file</replaceable> that corresponds to a time
-        zone name <replaceable>tz_name</replaceable>, invoke
-        <command>mysql_tzinfo_to_sql</command> like this:
-      </para>
+      <itemizedlist>
 
+        <listitem>
+          <para>
+            To load a single time zone file
+            <replaceable>tz_file</replaceable> that corresponds to a
+            time zone name <replaceable>tz_name</replaceable>, invoke
+            <command>mysql_tzinfo_to_sql</command> like this:
+          </para>
+
 <programlisting>
 shell&gt; <userinput>mysql_tzinfo_to_sql <replaceable>tz_file</replaceable> <replaceable>tz_name</replaceable> | mysql -u root mysql</userinput>
 </programlisting>
+        </listitem>
 
-      <para>
-        If your time zone needs to account for leap seconds, initialize
-        the leap second information like this, where
-        <replaceable>tz_file</replaceable> is the name of your time zone
-        file:
-      </para>
+        <listitem>
+          <para>
+            If your time zone needs to account for leap seconds,
+            initialize the leap second information like this, where
+            <replaceable>tz_file</replaceable> is the name of your time
+            zone file:
+          </para>
 
 <programlisting>
 shell&gt; <userinput>mysql_tzinfo_to_sql --leap <replaceable>tz_file</replaceable> | mysql -u root mysql</userinput>
 </programlisting>
+        </listitem>
 
+      </itemizedlist>
+
       <para>
         If your system doesn't have a zoneinfo database (for example,
         Windows or HP-UX), you can use the package of pre-built time
@@ -21713,23 +21733,23 @@
         contains <filename>.frm</filename>, <filename>.MYD</filename>,
         and <filename>.MYI</filename> files for the
         <literal>MyISAM</literal> time zone tables. These tables should
-        belong to the <literal>mysql</literal> database, so you should
+        be part of the <literal>mysql</literal> database, so you should
         place the files in the <filename>mysql</filename> subdirectory
-        of your MySQL server's data directory. The server should be shut
-        down while you do this.
+        of your MySQL server's data directory. The server should be
+        stopped while you do this.
       </para>
 
       <para>
-        <emphasis role="bold">Warning!</emphasis> Please don't use the
+        <emphasis role="bold">Warning</emphasis>: Please don't use the
         downloadable package if your system has a zoneinfo database. Use
-        the <command>mysql_tzinfo_to_sql</command> utility instead!
+        the <command>mysql_tzinfo_to_sql</command> utility instead.
         Otherwise, you may cause a difference in datetime handling
         between MySQL and other applications on your system.
       </para>
 
       <para>
-        For information about time zone settings in replication setup
-        please look into <xref linkend="replication-features"/>.
+        For information about time zone settings in replication setup,
+        please see <xref linkend="replication-features"/>.
       </para>
 
     </section>

Modified: trunk/refman-5.1/problems.xml
===================================================================
--- trunk/refman-5.1/problems.xml	2006-01-27 23:06:29 UTC (rev 1071)
+++ trunk/refman-5.1/problems.xml	2006-01-27 23:52:05 UTC (rev 1072)
@@ -2580,8 +2580,7 @@
             the same data directory on a system that doesn't support
             good filesystem locks (normally handled by the
             <literal>lockd</literal> lock manager), or you are running
-            multiple servers with the
-            <option>--skip-external-locking</option> option.
+            multiple servers with external locking disabled.
           </para>
         </listitem>
 

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