List:Commits« Previous MessageNext Message »
From:paul Date:January 26 2006 9:43pm
Subject:svn commit - mysqldoc@docsrva: r1051 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-26 22:43:21 +0100 (Thu, 26 Jan 2006)
New Revision: 1051

Log:
 r2564@kite-hub:  paul | 2006-01-26 15:43:14 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/language-structure.xml
   trunk/refman-4.1/replication.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/innodb.xml
   trunk/refman-5.0/language-structure.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.0/stored-procedures.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/innodb.xml
   trunk/refman-5.1/language-structure.xml
   trunk/refman-5.1/replication.xml
   trunk/refman-5.1/stored-procedures.xml


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

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-4.1/database-administration.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -2840,10 +2840,10 @@
             <para>
               If this is set to a non-zero value, all tables are closed
               every <literal>flush_time</literal> seconds to free up
-              resources and synchronize unflushed data to disk. We recommend
-              this option only on Windows 9x or Me, or on systems with
-              minimal resources available. This variable was added in
-              MySQL 3.22.18.
+              resources and synchronize unflushed data to disk. We
+              recommend this option be used only on Windows 9x or Me, or
+              on systems with minimal resources. This variable was added
+              in MySQL 3.22.18.
             </para>
           </listitem>
 
@@ -3048,8 +3048,9 @@
             </para>
 
             <para>
-              Whether the <literal>zlib</literal> compression library is
-              available to the server. If not, the
+              <literal>YES</literal> if the <literal>zlib</literal>
+              compression library is available to the server,
+              <literal>NO</literal> if not. If not, the
               <literal>COMPRESS()</literal> and
               <literal>UNCOMPRESS()</literal> functions cannot be used.
               This variable was added in MySQL 4.1.1.
@@ -3062,8 +3063,9 @@
             </para>
 
             <para>
-              Whether the <literal>crypt()</literal> system call is
-              available to the server. If not, the
+              <literal>YES</literal> if the <literal>crypt()</literal>
+              system call is available to the server,
+              <literal>NO</literal> if not. If not, the
               <literal>ENCRYPT()</literal> function cannot be used. This
               variable was added in MySQL 4.0.10.
             </para>
@@ -3101,8 +3103,9 @@
             </para>
 
             <para>
-              Whether the server supports spatial data types. This
-              variable was added in MySQL 4.1.3.
+              <literal>YES</literal> if the server supports spatial data
+              types, <literal>NO</literal> if not. This variable was
+              added in MySQL 4.1.3.
             </para>
           </listitem>
 
@@ -3155,8 +3158,9 @@
 
             <para>
               <literal>YES</literal> if <command>mysqld</command>
-              supports SSL (encryption) of the client/server protocol.
-              This variable was added in MySQL 3.23.43.
+              supports SSL (encryption) of the client/server protocol,
+              <literal>NO</literal> if not. This variable was added in
+              MySQL 3.23.43.
             </para>
           </listitem>
 
@@ -3167,8 +3171,8 @@
 
             <para>
               <literal>YES</literal> if <command>mysqld</command>
-              supports the query cache. This variable was added in MySQL
-              4.0.2.
+              supports the query cache, <literal>NO</literal> if not.
+              This variable was added in MySQL 4.0.2.
             </para>
           </listitem>
 
@@ -3179,8 +3183,9 @@
 
             <para>
               <literal>YES</literal> if <command>mysqld</command>
-              supports the <literal>RAID</literal> option. This variable
-              was added in MySQL 3.23.30.
+              supports the <literal>RAID</literal> option,
+              <literal>NO</literal> if not. This variable was added in
+              MySQL 3.23.30.
             </para>
           </listitem>
 
@@ -3190,10 +3195,10 @@
             </para>
 
             <para>
-              Whether <literal>RTREE</literal> indexes are available.
-              (These are used for spatial indexes in
-              <literal>MyISAM</literal> tables.) This variable was added
-              in MySQL 4.1.3.
+              <literal>YES</literal> if <literal>RTREE</literal> indexes
+              are available, <literal>NO</literal> if not. (These are
+              used for spatial indexes in <literal>MyISAM</literal>
+              tables.) This variable was added in MySQL 4.1.3.
             </para>
           </listitem>
 
@@ -3207,10 +3212,11 @@
             </remark>
 
             <para>
-              Whether symbolic link support is enabled. This is required
-              on Unix for support of the <literal>DATA
-              DIRECTORY</literal> and <literal>INDEX DIRECTORY</literal>
-              table options.
+              <literal>YES</literal> if symbolic link support is
+              enabled, <literal>NO</literal> if not. This is required on
+              Unix for support of the <literal>DATA DIRECTORY</literal>
+              and <literal>INDEX DIRECTORY</literal> table options, and
+              on Windows for support of data directory symlinks.
             </para>
 
             <para>
@@ -3236,7 +3242,7 @@
               statements. To specify multiple statements, separate them
               by semicolon characters. For example, each client begins
               by default with autocommit mode enabled. There is no
-              global server variable to specify that autocommit should
+              global system variable to specify that autocommit should
               be disabled by default, but
               <literal>init_connect</literal> can be used to achieve the
               same effect:
@@ -3259,15 +3265,21 @@
 
             <para>
               Note that the content of <literal>init_connect</literal>
-              is not executed for users having the
-              <literal>SUPER</literal> privilege; this is in case that
-              content has been wrongly set (contains a wrong query, for
-              example with a syntax error), thus making all connections
-              fail. Not executing it for <literal>SUPER</literal> users
-              enables those to open a connection and fix
-              <literal>init_connect</literal>. This variable was added
-              in MySQL 4.1.2.
+              is not executed for users that have the
+              <literal>SUPER</literal> privilege. This is done so that
+              an erroneous value for <literal>init_connect</literal>
+              does not prevent all clients from connecting. For example,
+              the value might contain a statement that has a syntax
+              error, thus causing client connections to fail. Not
+              executing <literal>init_connect</literal> for users that
+              have the <literal>SUPER</literal> privilege enables them
+              to open a connection and fix the
+              <literal>init_connect</literal> value.
             </para>
+
+            <para>
+              This variable was added in MySQL 4.1.2.
+            </para>
           </listitem>
 
           <listitem>
@@ -3278,10 +3290,10 @@
             <para>
               The name of the file specified with the
               <option>--init-file</option> option when you start the
-              server. This is a file containing SQL statements that you
-              want the server to execute when it starts. Each statement
-              must be on a single line and should not include comments.
-              This variable was added in MySQL 3.23.2.
+              server. This should be a file containing SQL statements
+              that you want the server to execute when it starts. Each
+              statement must be on a single line and should not include
+              comments. This variable was added in MySQL 3.23.2.
             </para>
           </listitem>
 
@@ -3306,8 +3318,8 @@
             </para>
 
             <para>
-              The <literal>InnoDB</literal> system variables are listed
-              in <xref linkend="innodb-parameters"/>.
+              <literal>InnoDB</literal> system variables are listed in
+              <xref linkend="innodb-parameters"/>.
             </para>
           </listitem>
 
@@ -3332,14 +3344,15 @@
             </para>
 
             <para>
-              The size of the buffer that is used for full joins (joins
-              that do not use indexes). Normally the best way to get
-              fast joins is to add indexes. Increase the value of
-              <literal>join_buffer_size</literal> to get a faster full
-              join when adding indexes is not possible. One join buffer
-              is allocated for each full join between two tables. For a
-              complex join between several tables for which indexes are
-              not used, multiple join buffers might be necessary.
+              The size of the buffer that is used for joins that do not
+              use indexes and thus perform full table scans. Normally,
+              the best way to get fast joins is to add indexes. Increase
+              the value of <literal>join_buffer_size</literal> to get a
+              faster full join when adding indexes is not possible. One
+              join buffer is allocated for each full join between two
+              tables. For a complex join between several tables for
+              which indexes are not used, multiple join buffers might be
+              necessary.
             </para>
           </listitem>
 
@@ -3379,12 +3392,14 @@
               become extremely slow. MySQL relies on the operating
               system to perform filesystem caching for data reads, so
               you must leave some room for the filesystem cache.
+              Consider also the memory requirements of other storage
+              engines.
             </para>
 
             <para>
               For even more speed when writing many rows at the same
               time, use <literal>LOCK TABLES</literal>. See
-              <xref linkend="lock-tables"/>.
+              <xref linkend="insert-speed"/>.
             </para>
 
             <para>
@@ -3393,12 +3408,9 @@
               the <literal>Key_read_requests</literal>,
               <literal>Key_reads</literal>,
               <literal>Key_write_requests</literal>, and
-              <literal>Key_writes</literal> status variables. See
-              <xref linkend="show"/>.
-            </para>
-
-            <para>
-              The <literal>Key_reads/Key_read_requests</literal> ratio
+              <literal>Key_writes</literal> status variables. (See
+              <xref linkend="show"/>.) The
+              <literal>Key_reads/Key_read_requests</literal> ratio
               should normally be less than 0.01. The
               <literal>Key_writes/Key_write_requests</literal> ratio is
               usually near 1 if you are using mostly updates and
@@ -3419,7 +3431,7 @@
             </para>
 
 <programlisting>
-1 - ((Key_blocks_unused * key_cache_block_size) / key_buffer_size)
+1 - ((Key_blocks_unused &times; key_cache_block_size) / key_buffer_size)
 </programlisting>
 
             <para>
@@ -3437,7 +3449,7 @@
             </para>
 
 <programlisting>
-(Key_blocks_used * 1024) / key_buffer_size
+(Key_blocks_used &times; 1024) / key_buffer_size
 </programlisting>
 
             <para>
@@ -3525,8 +3537,8 @@
             </para>
 
             <para>
-              Indicates whether large page support is enabled. This
-              variable was added in MySQL 5.0.3.
+              Whether large page support is enabled. This variable was
+              added in MySQL 5.0.3.
             </para>
           </listitem>
 
@@ -3548,8 +3560,9 @@
 
             <para>
               Whether <literal>LOCAL</literal> is supported for
-              <literal>LOAD DATA INFILE</literal> statements. This
-              variable was added in MySQL 4.0.3.
+              <literal>LOAD DATA INFILE</literal> statements. See
+              <xref linkend="load-data-local"/>. This variable was added
+              in MySQL 4.0.3.
             </para>
           </listitem>
 
@@ -3659,9 +3672,9 @@
             </para>
 
             <para>
-              If a query takes longer than this many seconds, the
-              <literal>Slow_queries</literal> status variable is
-              incremented. If you are using the
+              If a query takes longer than this many seconds, the server
+              increments the <literal>Slow_queries</literal> status
+              variable. If you are using the
               <option>--log-slow-queries</option> option, the query is
               logged to the slow query log file. This value is measured
               in real time, not CPU time, so a query that is under the
@@ -3695,11 +3708,11 @@
             </para>
 
             <para>
-              This variable indicates whether the filesystem where the
-              data directory is located has case insensitive filenames.
-              <literal>ON</literal> means filenames are case
-              insensitive, <literal>OFF</literal> means they are case
-              sensitive. This variable was added in MySQL 4.0.19.
+              This variable describes the case sensitivity of filenames
+              on the filesystem where the data directory is located.
+              <literal>OFF</literal> means filenames are case sensitive,
+              <literal>ON</literal> means they are not case sensitive.
+              This variable was added in MySQL 4.0.19.
             </para>
           </listitem>
 
@@ -3753,8 +3766,8 @@
               The packet message buffer is initialized to
               <literal>net_buffer_length</literal> bytes, but can grow
               up to <literal>max_allowed_packet</literal> bytes when
-              needed. This value by default is small, to catch big
-              (possibly wrong) packets.
+              needed. This value by default is small, to catch large
+              (possibly incorrect) packets.
             </para>
 
             <para>
@@ -3774,10 +3787,10 @@
 
             <para>
               If a multiple-statement transaction requires more than
-              this amount of memory, you get the error
+              this amount of memory, the server generates a
               <literal>Multi-statement transaction required more than
-              'max_binlog_cache_size' bytes of storage</literal>. This
-              variable was added in MySQL 3.23.29.
+              'max_binlog_cache_size' bytes of storage</literal> error.
+              This variable was added in MySQL 3.23.29.
             </para>
           </listitem>
 
@@ -3787,18 +3800,20 @@
             </para>
 
             <para>
-              If a write to the binary log exceeds the given value,
-              rotate the binary logs. You cannot set this variable to
+              If a write to the binary log causes the current log file
+              size to exceed the value of this variable, the server
+              rotates the binary logs (closes the current file and opens
+              the next one). You cannot set this variable to more than
               more than 1GB or to less than 4096 bytes. (The minimum
               before MYSQL 4.0.14 is 1024 bytes.) The default value is
               1GB. This variable was added in MySQL 3.23.33.
             </para>
 
             <para>
-              Note if you are using transactions: A transaction is
-              written in one chunk to the binary log, hence it is never
-              split between several binary logs. Therefore, if you have
-              big transactions, you might see binary logs bigger than
+              A transaction is written in one chunk to the binary log,
+              so it is never split between several binary logs.
+              Therefore, if you have big transactions, you might see
+              binary logs larger than
               <literal>max_binlog_size</literal>.
             </para>
 
@@ -3864,9 +3879,9 @@
 
             <para>
               The maximum number of error, warning, and note messages to
-              be stored for display by <literal>SHOW ERRORS</literal> or
-              <literal>SHOW WARNINGS</literal>. This variable was added
-              in MySQL 4.1.0.
+              be stored for display by the <literal>SHOW
+              ERRORS</literal> or <literal>SHOW WARNINGS</literal>
+              statements. This variable was added in MySQL 4.1.0.
             </para>
           </listitem>
 
@@ -3961,12 +3976,16 @@
             </para>
 
             <para>
-              If a write by a replication slave to its relay log exceeds
-              the given value, rotate the relay log. This variable
-              enables you to put different size constraints on relay
-              logs and binary logs. However, setting the variable to 0
-              makes MySQL use <literal>max_binlog_size</literal> for
-              both binary logs and relay logs. You must set
+              If a write by a replication slave to its relay log causes
+              the current log file size to exceed the value of this
+              variable, the slave rotates the relay logs (closes the
+              current file and opens the next one). If
+              <literal>max_relay_log_size</literal> is 0, the server
+              uses <literal>max_binlog_size</literal> for both the
+              binary log and the relay log. If
+              <literal>max_relay_log_size</literal> is greater than 0,
+              it constrains the size of the relay log, which enables you
+              to have different sizes for the two logs. You must set
               <literal>max_relay_log_size</literal> to between 4096
               bytes and 1GB (inclusive), or to <literal>0</literal>. The
               default value is <literal>0</literal>. This variable was
@@ -3984,11 +4003,11 @@
               Limit the assumed maximum number of seeks when looking up
               rows based on a key. The MySQL optimizer assumes that no
               more than this number of key seeks are required when
-              searching for matching rows in a table by scanning a key,
-              regardless of the actual cardinality of the key (see
-              <xref linkend="show-index"/>). By setting this to a low
-              value (say, <literal>100</literal>), you can force MySQL
-              to prefer keys instead of table scans.
+              searching for matching rows in a table by scanning an
+              index, regardless of the actual cardinality of the index
+              (see <xref linkend="show-index"/>). By setting this to a
+              low value (say, 100), you can force MySQL to prefer
+              indexes instead of table scans.
             </para>
 
             <para>
@@ -6744,9 +6763,10 @@
             </para>
 
             <para>
-              The number of joins that do not use indexes. If this value
-              is not 0, you should carefully check the indexes of your
-              tables. This variable was added in MySQL 3.23.25.
+              The number of joins that perform table scans because they
+              do not use indexes. If this value is not 0, you should
+              carefully check the indexes of your tables. This variable
+              was added in MySQL 3.23.25.
             </para>
           </listitem>
 
@@ -20305,8 +20325,8 @@
         rolled back <literal>InnoDB</literal> transactions from the
         binary log. This ensures that the binary log reflects the exact
         state of <literal>InnoDB</literal> tables, and thus, that the
-        slave remains in synchrony with the master (and does not receive any
-        statements which have been rolled back).
+        slave remains in synchrony with the master (not receiving a
+        statement which has been rolled back).
       </para>
 
       <para>

Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-4.1/language-structure.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -1489,10 +1489,6 @@
       <primary>system variables</primary>
     </indexterm>
 
-    <indexterm>
-      <primary>server variables</primary>
-    </indexterm>
-
     <para>
       Starting from MySQL 4.0.3, we provide better access to a lot of
       system and connection variables. Many variables can be changed

Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-4.1/replication.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -3110,8 +3110,8 @@
           and client programs, and no bugs in MySQL itself, an error
           that stops replication should never occur. Indiscriminate use
           of this option results in slaves becoming hopelessly out of
-          synchrony with the master, with you having no idea why this has
-          occurred.
+          synchrony with the master, with you having no idea why this
+          has occurred.
         </para>
 
         <para>
@@ -3595,9 +3595,9 @@
       master/slave relationship over a dial-up link where the link is up
       only sporadically and for short periods of time. The implication
       of this is that, at any given time, the slave is not guaranteed to
-      be in synchrony with the master unless you take some special measures.
-      In the future, we will have the option to block the master until
-      at least one slave is in sync.
+      be in synchrony with the master unless you take some special
+      measures. In the future, we will have the option to block the
+      master until at least one slave is in sync.
     </para>
 
     <para>
@@ -3681,7 +3681,8 @@
         <para>
           The <literal>SELECT</literal> statement blocks until the slave
           reaches the specified log file and offset. At that point, the
-          slave is in synchrony with the master and the statement returns.
+          slave is in synchrony with the master and the statement
+          returns.
         </para>
       </listitem>
 

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-5.0/database-administration.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -3130,9 +3130,9 @@
             <para>
               If this is set to a non-zero value, all tables are closed
               every <literal>flush_time</literal> seconds to free up
-              resources and synchronize unflushed data to disk. We recommend
-              that this option be used only on Windows 9x or Me, or on
-              systems with minimal resources.
+              resources and synchronize unflushed data to disk. We
+              recommend that this option be used only on Windows 9x or
+              Me, or on systems with minimal resources.
             </para>
           </listitem>
 
@@ -3329,8 +3329,9 @@
             </para>
 
             <para>
-              Whether the <literal>zlib</literal> compression library is
-              available to the server. If not, the
+              <literal>YES</literal> if the <literal>zlib</literal>
+              compression library is available to the server,
+              <literal>NO</literal> if not. If not, the
               <literal>COMPRESS()</literal> and
               <literal>UNCOMPRESS()</literal> functions cannot be used.
             </para>
@@ -3342,8 +3343,9 @@
             </para>
 
             <para>
-              Whether the <literal>crypt()</literal> system call is
-              available to the server. If not, the
+              <literal>YES</literal> if the <literal>crypt()</literal>
+              system call is available to the server,
+              <literal>NO</literal> if not. If not, the
               <literal>ENCRYPT()</literal> function cannot be used.
             </para>
           </listitem>
@@ -3389,7 +3391,8 @@
             </para>
 
             <para>
-              Whether the server supports spatial data types.
+              <literal>YES</literal> if the server supports spatial data
+              types, <literal>NO</literal> if not.
             </para>
           </listitem>
 
@@ -3412,10 +3415,10 @@
             </para>
 
             <para>
-              In MySQL &current-series;, this appears only for reasons
-              of backward compatibility, and is always
-              <literal>NO</literal>, as <literal>ISAM</literal> tables
-              are no longer supported.
+              In MySQL &current-series;, this variable appears only for
+              reasons of backward compatibility. It is always
+              <literal>NO</literal> because <literal>ISAM</literal>
+              tables are no longer supported.
             </para>
           </listitem>
 
@@ -3439,7 +3442,8 @@
 
             <para>
               <literal>YES</literal> if <command>mysqld</command>
-              supports SSL (encryption) of the client/server protocol.
+              supports SSL (encryption) of the client/server protocol,
+              <literal>NO</literal> if not.
             </para>
           </listitem>
 
@@ -3450,7 +3454,7 @@
 
             <para>
               <literal>YES</literal> if <command>mysqld</command>
-              supports the query cache.
+              supports the query cache, <literal>NO</literal> if not.
             </para>
           </listitem>
 
@@ -3461,7 +3465,8 @@
 
             <para>
               <literal>YES</literal> if <command>mysqld</command>
-              supports the <literal>RAID</literal> option.
+              supports the <literal>RAID</literal> option,
+              <literal>NO</literal> if not.
             </para>
           </listitem>
 
@@ -3471,9 +3476,10 @@
             </para>
 
             <para>
-              Whether <literal>RTREE</literal> indexes are available.
-              (These are used for spatial indexes in
-              <literal>MyISAM</literal> tables.)
+              <literal>YES</literal> if <literal>RTREE</literal> indexes
+              are available, <literal>NO</literal> if not. (These are
+              used for spatial indexes in <literal>MyISAM</literal>
+              tables.)
             </para>
           </listitem>
 
@@ -3483,14 +3489,11 @@
             </para>
 
             <para>
-              Whether symbolic link support is enabled. This is required
-              on Unix for support of the <literal>DATA
-              DIRECTORY</literal> and <literal>INDEX DIRECTORY</literal>
-              table options.
-
-              <remark role="todo">
-                also used on Windows for dir symlinking?
-              </remark>
+              <literal>YES</literal> if symbolic link support is
+              enabled, <literal>NO</literal> if not. This is required on
+              Unix for support of the <literal>DATA DIRECTORY</literal>
+              and <literal>INDEX DIRECTORY</literal> table options, and
+              on Windows for support of data directory symlinks.
             </para>
           </listitem>
 
@@ -3512,7 +3515,7 @@
               statements. To specify multiple statements, separate them
               by semicolon characters. For example, each client begins
               by default with autocommit mode enabled. There is no
-              global server variable to specify that autocommit should
+              global system variable to specify that autocommit should
               be disabled by default, but
               <literal>init_connect</literal> can be used to achieve the
               same effect:
@@ -3535,13 +3538,16 @@
 
             <para>
               Note that the content of <literal>init_connect</literal>
-              is not executed for users having the
-              <literal>SUPER</literal> privilege; this is in case that
-              content has been wrongly set (contains a wrong query, for
-              example with a syntax error), thus making all connections
-              fail. Not executing it for <literal>SUPER</literal> users
-              enables those to open a connection and fix
-              <literal>init_connect</literal>.
+              is not executed for users that have the
+              <literal>SUPER</literal> privilege. This is done so that
+              an erroneous value for <literal>init_connect</literal>
+              does not prevent all clients from connecting. For example,
+              the value might contain a statement that has a syntax
+              error, thus causing client connections to fail. Not
+              executing <literal>init_connect</literal> for users that
+              have the <literal>SUPER</literal> privilege enables them
+              to open a connection and fix the
+              <literal>init_connect</literal> value.
             </para>
           </listitem>
 
@@ -3553,9 +3559,10 @@
             <para>
               The name of the file specified with the
               <option>--init-file</option> option when you start the
-              server. This is a file containing SQL statements that you
-              want the server to execute when it starts. Each statement
-              must be on a single line and should not include comments.
+              server. This should be a file containing SQL statements
+              that you want the server to execute when it starts. Each
+              statement must be on a single line and should not include
+              comments.
             </para>
           </listitem>
 
@@ -3579,8 +3586,8 @@
             </para>
 
             <para>
-              The <literal>InnoDB</literal> system variables are listed
-              in <xref linkend="innodb-parameters"/>.
+              <literal>InnoDB</literal> system variables are listed in
+              <xref linkend="innodb-parameters"/>.
             </para>
           </listitem>
 
@@ -3605,14 +3612,15 @@
             </para>
 
             <para>
-              The size of the buffer that is used for full joins (joins
-              that do not use indexes). Normally the best way to get
-              fast joins is to add indexes. Increase the value of
-              <literal>join_buffer_size</literal> to get a faster full
-              join when adding indexes is not possible. One join buffer
-              is allocated for each full join between two tables. For a
-              complex join between several tables for which indexes are
-              not used, multiple join buffers might be necessary.
+              The size of the buffer that is used for joins that do not
+              use indexes and thus perform full table scans. Normally,
+              the best way to get fast joins is to add indexes. Increase
+              the value of <literal>join_buffer_size</literal> to get a
+              faster full join when adding indexes is not possible. One
+              join buffer is allocated for each full join between two
+              tables. For a complex join between several tables for
+              which indexes are not used, multiple join buffers might be
+              necessary.
             </para>
           </listitem>
 
@@ -3652,12 +3660,14 @@
               become extremely slow. MySQL relies on the operating
               system to perform filesystem caching for data reads, so
               you must leave some room for the filesystem cache.
+              Consider also the memory requirements of other storage
+              engines.
             </para>
 
             <para>
               For even more speed when writing many rows at the same
               time, use <literal>LOCK TABLES</literal>. See
-              <xref linkend="lock-tables"/>.
+              <xref linkend="insert-speed"/>.
             </para>
 
             <para>
@@ -3666,12 +3676,9 @@
               the <literal>Key_read_requests</literal>,
               <literal>Key_reads</literal>,
               <literal>Key_write_requests</literal>, and
-              <literal>Key_writes</literal> status variables. See
-              <xref linkend="show"/>.
-            </para>
-
-            <para>
-              The <literal>Key_reads/Key_read_requests</literal> ratio
+              <literal>Key_writes</literal> status variables. (See
+              <xref linkend="show"/>.) The
+              <literal>Key_reads/Key_read_requests</literal> ratio
               should normally be less than 0.01. The
               <literal>Key_writes/Key_write_requests</literal> ratio is
               usually near 1 if you are using mostly updates and
@@ -3685,14 +3692,13 @@
               The fraction of the key buffer in use can be determined
               using <literal>key_buffer_size</literal> in conjunction
               with the <literal>Key_blocks_unused</literal> status
-              variable and the buffer block size. The buffer block size
-              is available from the
-              <literal>key_cache_block_size</literal> server variable.
-              The fraction of the buffer in use is:
+              variable and the buffer block size, which is available
+              from the <literal>key_cache_block_size</literal> system
+              variable:
             </para>
 
 <programlisting>
-1 - ((Key_blocks_unused * key_cache_block_size) / key_buffer_size)
+1 - ((Key_blocks_unused &times; key_cache_block_size) / key_buffer_size)
 </programlisting>
 
             <para>
@@ -3775,8 +3781,8 @@
             </para>
 
             <para>
-              Indicates whether large page support is enabled. This
-              variable was added in MySQL 5.0.3.
+              Whether large page support is enabled. This variable was
+              added in MySQL 5.0.3.
             </para>
           </listitem>
 
@@ -3797,7 +3803,8 @@
 
             <para>
               Whether <literal>LOCAL</literal> is supported for
-              <literal>LOAD DATA INFILE</literal> statements.
+              <literal>LOAD DATA INFILE</literal> statements. See
+              <xref linkend="load-data-local"/>.
             </para>
           </listitem>
 
@@ -3848,24 +3855,17 @@
               functions unless they have the <literal>SUPER</literal>
               privilege in addition to the <literal>CREATE
               ROUTINE</literal> or <literal>ALTER ROUTINE</literal>
-              privilege.
-            </para>
-
-            <para>
-              A setting of 0 also enforces the restriction that a
-              function must be declared with the
+              privilege. A setting of 0 also enforces the restriction
+              that a function must be declared with the
               <literal>DETERMINISTIC</literal> characteristic, or with
               the <literal>READS SQL DATA</literal> or <literal>NO
               SQL</literal> characteristic. If the variable is set to 1,
               MySQL does not enforce these restrictions on stored
-              function creation.
+              function creation. See
+              <xref linkend="stored-procedure-logging"/>.
             </para>
 
             <para>
-              See <xref linkend="stored-procedure-logging"/>.
-            </para>
-
-            <para>
               This variable was added in MySQL 5.0.16.
             </para>
           </listitem>
@@ -3944,9 +3944,9 @@
             </para>
 
             <para>
-              If a query takes longer than this many seconds, the
-              <literal>Slow_queries</literal> status variable is
-              incremented. If you are using the
+              If a query takes longer than this many seconds, the server
+              increments the <literal>Slow_queries</literal> status
+              variable. If you are using the
               <option>--log-slow-queries</option> option, the query is
               logged to the slow query log file. This value is measured
               in real time, not CPU time, so a query that is under the
@@ -3979,11 +3979,10 @@
             </para>
 
             <para>
-              This variable indicates whether the filesystem where the
-              data directory is located has case insensitive filenames.
-              <literal>ON</literal> means filenames are case
-              insensitive, <literal>OFF</literal> means they are case
-              sensitive.
+              This variable describes the case sensitivity of filenames
+              on the filesystem where the data directory is located.
+              <literal>OFF</literal> means filenames are case sensitive,
+              <literal>ON</literal> means they are not case sensitive.
             </para>
           </listitem>
 
@@ -4032,8 +4031,8 @@
               The packet message buffer is initialized to
               <literal>net_buffer_length</literal> bytes, but can grow
               up to <literal>max_allowed_packet</literal> bytes when
-              needed. This value by default is small, to catch big
-              (possibly wrong) packets.
+              needed. This value by default is small, to catch large
+              (possibly incorrect) packets.
             </para>
 
             <para>
@@ -4052,9 +4051,9 @@
 
             <para>
               If a multiple-statement transaction requires more than
-              this amount of memory, you get the error
+              this amount of memory, the server generates a
               <literal>Multi-statement transaction required more than
-              'max_binlog_cache_size' bytes of storage</literal>.
+              'max_binlog_cache_size' bytes of storage</literal> error.
             </para>
           </listitem>
 
@@ -4064,17 +4063,18 @@
             </para>
 
             <para>
-              If a write to the binary log exceeds the given value,
-              rotate the binary logs. You cannot set this variable to
-              more than 1GB or to less than 4096 bytes. The default
-              value is 1GB.
+              If a write to the binary log causes the current log file
+              size to exceed the value of this variable, the server
+              rotates the binary logs (closes the current file and opens
+              the next one). You cannot set this variable to more than
+              1GB or to less than 4096 bytes. The default value is 1GB.
             </para>
 
             <para>
-              Note if you are using transactions: A transaction is
-              written in one chunk to the binary log, hence it is never
-              split between several binary logs. Therefore, if you have
-              big transactions, you might see binary logs bigger than
+              A transaction is written in one chunk to the binary log,
+              so it is never split between several binary logs.
+              Therefore, if you have big transactions, you might see
+              binary logs larger than
               <literal>max_binlog_size</literal>.
             </para>
 
@@ -4137,8 +4137,9 @@
 
             <para>
               The maximum number of error, warning, and note messages to
-              be stored for display by <literal>SHOW ERRORS</literal> or
-              <literal>SHOW WARNINGS</literal>.
+              be stored for display by the <literal>SHOW
+              ERRORS</literal> and <literal>SHOW WARNINGS</literal>
+              statements.
             </para>
           </listitem>
 
@@ -4231,12 +4232,16 @@
             </para>
 
             <para>
-              If a write by a replication slave to its relay log exceeds
-              the given value, rotate the relay log. This variable
-              enables you to put different size constraints on relay
-              logs and binary logs. However, setting the variable to 0
-              makes MySQL use <literal>max_binlog_size</literal> for
-              both binary logs and relay logs. You must set
+              If a write by a replication slave to its relay log causes
+              the current log file size to exceed the value of this
+              variable, the slave rotates the relay logs (closes the
+              current file and opens the next one). If
+              <literal>max_relay_log_size</literal> is 0, the server
+              uses <literal>max_binlog_size</literal> for both the
+              binary log and the relay log. If
+              <literal>max_relay_log_size</literal> is greater than 0,
+              it constrains the size of the relay log, which enables you
+              to have different sizes for the two logs. You must set
               <literal>max_relay_log_size</literal> to between 4096
               bytes and 1GB (inclusive), or to 0. The default value is
               0. See
@@ -4253,11 +4258,11 @@
               Limit the assumed maximum number of seeks when looking up
               rows based on a key. The MySQL optimizer assumes that no
               more than this number of key seeks are required when
-              searching for matching rows in a table by scanning a key,
-              regardless of the actual cardinality of the key (see
-              <xref linkend="show-index"/>). By setting this to a low
-              value (100?), you can force MySQL to prefer keys instead
-              of table scans.
+              searching for matching rows in a table by scanning an
+              index, regardless of the actual cardinality of the index
+              (see <xref linkend="show-index"/>). By setting this to a
+              low value (say, 100), you can force MySQL to prefer
+              indexes instead of table scans.
             </para>
           </listitem>
 
@@ -7596,9 +7601,9 @@
             </para>
 
             <para>
-              The number of joins that do not use indexes. If this value
-              is not 0, you should carefully check the indexes of your
-              tables.
+              The number of joins that perform table scans because they
+              do not use indexes. If this value is not 0, you should
+              carefully check the indexes of your tables.
             </para>
           </listitem>
 
@@ -22378,8 +22383,8 @@
         <literal>InnoDB</literal> transactions from the binary log. This
         ensures that the binary log reflects the exact data of
         <literal>InnoDB</literal> tables, and so, that the slave remains
-        in synchrony with the master (not receiving a statement which has
-        been rolled back).
+        in synchrony with the master (not receiving a statement which
+        has been rolled back).
       </para>
 
       <para>

Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-5.0/innodb.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -7178,9 +7178,9 @@
         own data dictionary inside the tablespace files. If you move
         <filename>.frm</filename> files around, or if the server crashes
         in the middle of a data dictionary operation, the locations of
-        the <filename>.frm</filename> files may end up out of synchrony with
-        the locations recorded in the <literal>InnoDB</literal> internal
-        data dictionary.
+        the <filename>.frm</filename> files may end up out of synchrony
+        with the locations recorded in the <literal>InnoDB</literal>
+        internal data dictionary.
       </para>
 
       <para>

Modified: trunk/refman-5.0/language-structure.xml
===================================================================
--- trunk/refman-5.0/language-structure.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-5.0/language-structure.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -1473,10 +1473,6 @@
       <primary>system variables</primary>
     </indexterm>
 
-    <indexterm>
-      <primary>server variables</primary>
-    </indexterm>
-
     <para>
       MySQL provides access to many system and connection variables.
       Many variables can be changed dynamically while the server is

Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-5.0/replication.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -2977,8 +2977,8 @@
           and client programs, and no bugs in MySQL itself, an error
           that stops replication should never occur. Indiscriminate use
           of this option results in slaves becoming hopelessly out of
-          synchrony with the master, with you having no idea why this has
-          occurred.
+          synchrony with the master, with you having no idea why this
+          has occurred.
         </para>
 
         <para>
@@ -3492,9 +3492,9 @@
       master/slave relationship over a dial-up link where the link is up
       only sporadically and for short periods of time. The implication
       of this is that, at any given time, the slave is not guaranteed to
-      be in synchrony with the master unless you take some special measures.
-      In the future, we will have the option to block the master until
-      at least one slave is in sync.
+      be in synchrony with the master unless you take some special
+      measures. In the future, we will have the option to block the
+      master until at least one slave is in sync.
     </para>
 
     <para>
@@ -3574,7 +3574,8 @@
         <para>
           The <literal>SELECT</literal> statement blocks until the slave
           reaches the specified log file and offset. At that point, the
-          slave is in synchrony with the master and the statement returns.
+          slave is in synchrony with the master and the statement
+          returns.
         </para>
       </listitem>
 
@@ -4317,12 +4318,11 @@
     </para>
 
     <para>
-      To accommodate multi-master replication with auto_increment, two
-      new server variables were introduced with MySQL 5.0.2:
-      <literal>auto_increment_increment</literal> and
-      <literal>auto_increment_offset</literal>. Each of these variables
-      has a default (and minimum) value of 1, and a maximum value of
-      65,535.
+      To accommodate multi-master replication with auto_increment, the
+      two system variables <literal>auto_increment_increment</literal>
+      and <literal>auto_increment_offset</literal> were introduced in
+      MySQL 5.0.2. Each of these variables has a default (and minimum)
+      value of 1, and a maximum value of 65,535.
     </para>
 
     <para>

Modified: trunk/refman-5.0/stored-procedures.xml
===================================================================
--- trunk/refman-5.0/stored-procedures.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-5.0/stored-procedures.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -1106,7 +1106,7 @@
           The <literal>SET</literal> statement in stored routines is an
           extended version of the general <literal>SET</literal>
           statement. Referenced variables may be ones declared inside a
-          routine, or global server variables.
+          routine, or global system variables.
         </para>
 
         <para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-5.1/database-administration.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -3157,9 +3157,9 @@
             <para>
               If this is set to a non-zero value, all tables are closed
               every <literal>flush_time</literal> seconds to free up
-              resources and synchronize unflushed data to disk. We recommend
-              that this option be used only on Windows 9x or Me, or on
-              systems with minimal resources.
+              resources and synchronize unflushed data to disk. We
+              recommend that this option be used only on Windows 9x or
+              Me, or on systems with minimal resources.
             </para>
           </listitem>
 
@@ -3356,8 +3356,9 @@
             </para>
 
             <para>
-              Whether the <literal>zlib</literal> compression library is
-              available to the server. If not, the
+              <literal>YES</literal> if the <literal>zlib</literal>
+              compression library is available to the server,
+              <literal>NO</literal> if not. If not, the
               <literal>COMPRESS()</literal> and
               <literal>UNCOMPRESS()</literal> functions cannot be used.
             </para>
@@ -3369,8 +3370,9 @@
             </para>
 
             <para>
-              Whether the <literal>crypt()</literal> system call is
-              available to the server. If not, the
+              <literal>YES</literal> if the <literal>crypt()</literal>
+              system call is available to the server,
+              <literal>NO</literal> if not. If not, the
               <literal>ENCRYPT()</literal> function cannot be used.
             </para>
           </listitem>
@@ -3415,7 +3417,8 @@
             </para>
 
             <para>
-              Whether the server supports spatial data types.
+              <literal>YES</literal> if the server supports spatial data
+              types, <literal>NO</literal> if not.
             </para>
           </listitem>
 
@@ -3438,10 +3441,10 @@
             </para>
 
             <para>
-              In MySQL &current-series;, this appears only for reasons
-              of backward compatibility, and is always
-              <literal>NO</literal>, as <literal>ISAM</literal> tables
-              are no longer supported.
+              In MySQL &current-series;, this variable appears only for
+              reasons of backward compatibility. It is always
+              <literal>NO</literal> because <literal>ISAM</literal>
+              tables are no longer supported.
             </para>
           </listitem>
 
@@ -3478,7 +3481,8 @@
 
             <para>
               <literal>YES</literal> if <command>mysqld</command>
-              supports SSL (encryption) of the client/server protocol.
+              supports SSL (encryption) of the client/server protocol,
+              <literal>NO</literal> if not.
             </para>
           </listitem>
 
@@ -3489,7 +3493,7 @@
 
             <para>
               <literal>YES</literal> if <command>mysqld</command>
-              supports the query cache.
+              supports the query cache, <literal>NO</literal> if not.
             </para>
           </listitem>
 
@@ -3500,7 +3504,8 @@
 
             <para>
               <literal>YES</literal> if <command>mysqld</command>
-              supports the <literal>RAID</literal> option.
+              supports the <literal>RAID</literal> option,
+              <literal>NO</literal> if not.
             </para>
           </listitem>
 
@@ -3510,9 +3515,10 @@
             </para>
 
             <para>
-              Whether the server can perform replication using row-based
-              binary logging. If the value is <literal>NO</literal>, the
-              server can use only statement-based logging. See
+              <literal>YES</literal> if the server can perform
+              replication using row-based binary logging. If the value
+              is <literal>NO</literal>, the server can use only
+              statement-based logging. See
               <xref linkend="replication-row-based"/>. This variable was
               added in MySQL 5.1.5.
             </para>
@@ -3524,9 +3530,10 @@
             </para>
 
             <para>
-              Whether <literal>RTREE</literal> indexes are available.
-              (These are used for spatial indexes in
-              <literal>MyISAM</literal> tables.)
+              <literal>YES</literal> if <literal>RTREE</literal> indexes
+              are available, <literal>NO</literal> if not. (These are
+              used for spatial indexes in <literal>MyISAM</literal>
+              tables.)
             </para>
           </listitem>
 
@@ -3536,14 +3543,11 @@
             </para>
 
             <para>
-              Whether symbolic link support is enabled. This is required
-              on Unix for support of the <literal>DATA
-              DIRECTORY</literal> and <literal>INDEX DIRECTORY</literal>
-              table options.
-
-              <remark role="todo">
-                also used on Windows for dir symlinking?
-              </remark>
+              <literal>YES</literal> if symbolic link support is
+              enabled, <literal>NO</literal> if not. This is required on
+              Unix for support of the <literal>DATA DIRECTORY</literal>
+              and <literal>INDEX DIRECTORY</literal> table options, and
+              on Windows for support of data directory symlinks.
             </para>
           </listitem>
 
@@ -3565,7 +3569,7 @@
               statements. To specify multiple statements, separate them
               by semicolon characters. For example, each client begins
               by default with autocommit mode enabled. There is no
-              global server variable to specify that autocommit should
+              global system variable to specify that autocommit should
               be disabled by default, but
               <literal>init_connect</literal> can be used to achieve the
               same effect:
@@ -3588,13 +3592,16 @@
 
             <para>
               Note that the content of <literal>init_connect</literal>
-              is not executed for users having the
-              <literal>SUPER</literal> privilege; this is in case that
-              content has been wrongly set (contains a wrong query, for
-              example with a syntax error), thus making all connections
-              fail. Not executing it for <literal>SUPER</literal> users
-              enables those to open a connection and fix
-              <literal>init_connect</literal>.
+              is not executed for users that have the
+              <literal>SUPER</literal> privilege. This is done so that
+              an erroneous value for <literal>init_connect</literal>
+              does not prevent all clients from connecting. For example,
+              the value might contain a statement that has a syntax
+              error, thus causing client connections to fail. Not
+              executing <literal>init_connect</literal> for users that
+              have the <literal>SUPER</literal> privilege enables them
+              to open a connection and fix the
+              <literal>init_connect</literal> value.
             </para>
           </listitem>
 
@@ -3606,9 +3613,10 @@
             <para>
               The name of the file specified with the
               <option>--init-file</option> option when you start the
-              server. This is a file containing SQL statements that you
-              want the server to execute when it starts. Each statement
-              must be on a single line and should not include comments.
+              server. This should be a file containing SQL statements
+              that you want the server to execute when it starts. Each
+              statement must be on a single line and should not include
+              comments.
             </para>
           </listitem>
 
@@ -3632,8 +3640,8 @@
             </para>
 
             <para>
-              The <literal>InnoDB</literal> system variables are listed
-              in <xref linkend="innodb-parameters"/>.
+              <literal>InnoDB</literal> system variables are listed in
+              <xref linkend="innodb-parameters"/>.
             </para>
           </listitem>
 
@@ -3658,14 +3666,15 @@
             </para>
 
             <para>
-              The size of the buffer that is used for full joins (joins
-              that do not use indexes). Normally the best way to get
-              fast joins is to add indexes. Increase the value of
-              <literal>join_buffer_size</literal> to get a faster full
-              join when adding indexes is not possible. One join buffer
-              is allocated for each full join between two tables. For a
-              complex join between several tables for which indexes are
-              not used, multiple join buffers might be necessary.
+              The size of the buffer that is used for joins that do not
+              use indexes and thus perform full table scans. Normally,
+              the best way to get fast joins is to add indexes. Increase
+              the value of <literal>join_buffer_size</literal> to get a
+              faster full join when adding indexes is not possible. One
+              join buffer is allocated for each full join between two
+              tables. For a complex join between several tables for
+              which indexes are not used, multiple join buffers might be
+              necessary.
             </para>
           </listitem>
 
@@ -3705,12 +3714,14 @@
               become extremely slow. MySQL relies on the operating
               system to perform filesystem caching for data reads, so
               you must leave some room for the filesystem cache.
+              Consider also the memory requirements of other storage
+              engines.
             </para>
 
             <para>
               For even more speed when writing many rows at the same
               time, use <literal>LOCK TABLES</literal>. See
-              <xref linkend="lock-tables"/>.
+              <xref linkend="insert-speed"/>.
             </para>
 
             <para>
@@ -3719,12 +3730,9 @@
               the <literal>Key_read_requests</literal>,
               <literal>Key_reads</literal>,
               <literal>Key_write_requests</literal>, and
-              <literal>Key_writes</literal> status variables. See
-              <xref linkend="show"/>.
-            </para>
-
-            <para>
-              The <literal>Key_reads/Key_read_requests</literal> ratio
+              <literal>Key_writes</literal> status variables. (See
+              <xref linkend="show"/>.) The
+              <literal>Key_reads/Key_read_requests</literal> ratio
               should normally be less than 0.01. The
               <literal>Key_writes/Key_write_requests</literal> ratio is
               usually near 1 if you are using mostly updates and
@@ -3738,14 +3746,13 @@
               The fraction of the key buffer in use can be determined
               using <literal>key_buffer_size</literal> in conjunction
               with the <literal>Key_blocks_unused</literal> status
-              variable and the buffer block size. The buffer block size
-              is available from the
-              <literal>key_cache_block_size</literal> server variable.
-              The fraction of the buffer in use is:
+              variable and the buffer block size, which is available
+              from the <literal>key_cache_block_size</literal> system
+              variable:
             </para>
 
 <programlisting>
-1 - ((Key_blocks_unused * key_cache_block_size) / key_buffer_size)
+1 - ((Key_blocks_unused &times; key_cache_block_size) / key_buffer_size)
 </programlisting>
 
             <para>
@@ -3828,7 +3835,7 @@
             </para>
 
             <para>
-              Indicates whether large page support is enabled.
+              Whether large page support is enabled.
             </para>
           </listitem>
 
@@ -3849,7 +3856,8 @@
 
             <para>
               Whether <literal>LOCAL</literal> is supported for
-              <literal>LOAD DATA INFILE</literal> statements.
+              <literal>LOAD DATA INFILE</literal> statements. See
+              <xref linkend="load-data-local"/>.
             </para>
           </listitem>
 
@@ -3900,22 +3908,15 @@
               routines unless they have the <literal>SUPER</literal>
               privilege in addition to the <literal>CREATE
               ROUTINE</literal> or <literal>ALTER ROUTINE</literal>
-              privilege.
-            </para>
-
-            <para>
-              A setting of 0 also enforces the restriction that a
-              function must be declared with the
+              privilege. A setting of 0 also enforces the restriction
+              that a function must be declared with the
               <literal>DETERMINISTIC</literal> characteristic, or with
               the <literal>READS SQL DATA</literal> or <literal>NO
               SQL</literal> characteristic. If the variable is set to 1,
               MySQL does not enforce these restrictions on stored
-              function creation.
+              function creation. See
+              <xref linkend="stored-procedure-logging"/>.
             </para>
-
-            <para>
-              See <xref linkend="stored-procedure-logging"/>.
-            </para>
           </listitem>
 
           <listitem>
@@ -3973,9 +3974,9 @@
             </para>
 
             <para>
-              If a query takes longer than this many seconds, the
-              <literal>Slow_queries</literal> status variable is
-              incremented. If you are using the
+              If a query takes longer than this many seconds, the server
+              increments the <literal>Slow_queries</literal> status
+              variable. If you are using the
               <option>--log-slow-queries</option> option, the query is
               logged to the slow query log file. This value is measured
               in real time, not CPU time, so a query that is under the
@@ -4008,11 +4009,10 @@
             </para>
 
             <para>
-              This variable indicates whether the filesystem where the
-              data directory is located has case insensitive filenames.
-              <literal>ON</literal> means filenames are case
-              insensitive, <literal>OFF</literal> means they are case
-              sensitive.
+              This variable describes the case sensitivity of filenames
+              on the filesystem where the data directory is located.
+              <literal>OFF</literal> means filenames are case sensitive,
+              <literal>ON</literal> means they are not case sensitive.
             </para>
           </listitem>
 
@@ -4061,8 +4061,8 @@
               The packet message buffer is initialized to
               <literal>net_buffer_length</literal> bytes, but can grow
               up to <literal>max_allowed_packet</literal> bytes when
-              needed. This value by default is small, to catch big
-              (possibly wrong) packets.
+              needed. This value by default is small, to catch large
+              (possibly incorrect) packets.
             </para>
 
             <para>
@@ -4081,9 +4081,9 @@
 
             <para>
               If a multiple-statement transaction requires more than
-              this amount of memory, you get the error
+              this amount of memory, the server generates a
               <literal>Multi-statement transaction required more than
-              'max_binlog_cache_size' bytes of storage</literal>.
+              'max_binlog_cache_size' bytes of storage</literal> error.
             </para>
           </listitem>
 
@@ -4093,17 +4093,18 @@
             </para>
 
             <para>
-              If a write to the binary log exceeds the given value,
-              rotate the binary logs. You cannot set this variable to
-              more than 1GB or to less than 4096 bytes. The default
-              value is 1GB.
+              If a write to the binary log causes the current log file
+              size to exceed the value of this variable, the server
+              rotates the binary logs (closes the current file and opens
+              the next one). You cannot set this variable to more than
+              1GB or to less than 4096 bytes. The default value is 1GB.
             </para>
 
             <para>
-              Note if you are using transactions: A transaction is
-              written in one chunk to the binary log, hence it is never
-              split between several binary logs. Therefore, if you have
-              big transactions, you might see binary logs bigger than
+              A transaction is written in one chunk to the binary log,
+              so it is never split between several binary logs.
+              Therefore, if you have big transactions, you might see
+              binary logs larger than
               <literal>max_binlog_size</literal>.
             </para>
 
@@ -4166,8 +4167,9 @@
 
             <para>
               The maximum number of error, warning, and note messages to
-              be stored for display by <literal>SHOW ERRORS</literal> or
-              <literal>SHOW WARNINGS</literal>.
+              be stored for display by the <literal>SHOW
+              ERRORS</literal> and <literal>SHOW WARNINGS</literal>
+              statements.
             </para>
           </listitem>
 
@@ -4260,12 +4262,16 @@
             </para>
 
             <para>
-              If a write by a replication slave to its relay log exceeds
-              the given value, rotate the relay log. This variable
-              enables you to put different size constraints on relay
-              logs and binary logs. However, setting the variable to 0
-              makes MySQL use <literal>max_binlog_size</literal> for
-              both binary logs and relay logs. You must set
+              If a write by a replication slave to its relay log causes
+              the current log file size to exceed the value of this
+              variable, the slave rotates the relay logs (closes the
+              current file and opens the next one). If
+              <literal>max_relay_log_size</literal> is 0, the server
+              uses <literal>max_binlog_size</literal> for both the
+              binary log and the relay log. If
+              <literal>max_relay_log_size</literal> is greater than 0,
+              it constrains the size of the relay log, which enables you
+              to have different sizes for the two logs. You must set
               <literal>max_relay_log_size</literal> to between 4096
               bytes and 1GB (inclusive), or to 0. The default value is
               0. See
@@ -4282,11 +4288,11 @@
               Limit the assumed maximum number of seeks when looking up
               rows based on a key. The MySQL optimizer assumes that no
               more than this number of key seeks are required when
-              searching for matching rows in a table by scanning a key,
-              regardless of the actual cardinality of the key (see
-              <xref linkend="show-index"/>). By setting this to a low
-              value (100?), you can force MySQL to prefer keys instead
-              of table scans.
+              searching for matching rows in a table by scanning an
+              index, regardless of the actual cardinality of the index
+              (see <xref linkend="show-index"/>). By setting this to a
+              low value (say, 100), you can force MySQL to prefer
+              indexes instead of table scans.
             </para>
           </listitem>
 
@@ -7657,9 +7663,9 @@
             </para>
 
             <para>
-              The number of joins that do not use indexes. If this value
-              is not 0, you should carefully check the indexes of your
-              tables.
+              The number of joins that perform table scans because they
+              do not use indexes. If this value is not 0, you should
+              carefully check the indexes of your tables.
             </para>
           </listitem>
 
@@ -22387,8 +22393,8 @@
         <literal>InnoDB</literal> transactions from the binary log. This
         ensures that the binary log reflects the exact data of
         <literal>InnoDB</literal> tables, and so, that the slave remains
-        in synchrony with the master (not receiving a statement which has
-        been rolled back).
+        in synchrony with the master (not receiving a statement which
+        has been rolled back).
       </para>
 
       <para>

Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-5.1/innodb.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -7102,9 +7102,9 @@
         own data dictionary inside the tablespace files. If you move
         <filename>.frm</filename> files around, or if the server crashes
         in the middle of a data dictionary operation, the locations of
-        the <filename>.frm</filename> files may end up out of synchrony with
-        the locations recorded in the <literal>InnoDB</literal> internal
-        data dictionary.
+        the <filename>.frm</filename> files may end up out of synchrony
+        with the locations recorded in the <literal>InnoDB</literal>
+        internal data dictionary.
       </para>
 
       <para>

Modified: trunk/refman-5.1/language-structure.xml
===================================================================
--- trunk/refman-5.1/language-structure.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-5.1/language-structure.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -1473,10 +1473,6 @@
       <primary>system variables</primary>
     </indexterm>
 
-    <indexterm>
-      <primary>server variables</primary>
-    </indexterm>
-
     <para>
       MySQL provides access to many system and connection variables.
       Many variables can be changed dynamically while the server is

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-5.1/replication.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -3141,8 +3141,8 @@
           and client programs, and no bugs in MySQL itself, an error
           that stops replication should never occur. Indiscriminate use
           of this option results in slaves becoming hopelessly out of
-          synchrony with the master, with you having no idea why this has
-          occurred.
+          synchrony with the master, with you having no idea why this
+          has occurred.
         </para>
 
         <para>
@@ -3648,9 +3648,9 @@
       master/slave relationship over a dial-up link where the link is up
       only sporadically and for short periods of time. The implication
       of this is that, at any given time, the slave is not guaranteed to
-      be in synchrony with the master unless you take some special measures.
-      In the future, we will have the option to block the master until
-      at least one slave is in sync.
+      be in synchrony with the master unless you take some special
+      measures. In the future, we will have the option to block the
+      master until at least one slave is in sync.
     </para>
 
     <para>
@@ -3730,7 +3730,8 @@
         <para>
           The <literal>SELECT</literal> statement blocks until the slave
           reaches the specified log file and offset. At that point, the
-          slave is in synchrony with the master and the statement returns.
+          slave is in synchrony with the master and the statement
+          returns.
         </para>
       </listitem>
 
@@ -4844,7 +4845,7 @@
       </para>
 
       <para>
-        The two server variables
+        The two system variables
         <literal>auto_increment_increment</literal> and
         <literal>auto_increment_offset</literal> help to accommodate
         multi-master replication with <literal>AUTO_INCREMENT</literal>

Modified: trunk/refman-5.1/stored-procedures.xml
===================================================================
--- trunk/refman-5.1/stored-procedures.xml	2006-01-26 20:24:28 UTC (rev 1050)
+++ trunk/refman-5.1/stored-procedures.xml	2006-01-26 21:43:21 UTC (rev 1051)
@@ -1078,7 +1078,7 @@
           The <literal>SET</literal> statement in stored routines is an
           extended version of the general <literal>SET</literal>
           statement. Referenced variables may be ones declared inside a
-          routine, or global server variables.
+          routine, or global system variables.
         </para>
 
         <para>

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