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

Log:
 r2560@kite-hub:  paul | 2006-01-26 14:14:39 -0600
 General revisions.


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


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

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-26 19:08:01 UTC (rev 1048)
+++ trunk/refman-4.1/database-administration.xml	2006-01-26 20:14:54 UTC (rev 1049)
@@ -2134,7 +2134,7 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SET sort_buffer_size = 10 * 1024 * 1024;</userinput>
+SET sort_buffer_size = 10 * 1024 * 1024;
 </programlisting>
 
         <para>
@@ -2144,8 +2144,8 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;</userinput>
-mysql&gt; <userinput>SET SESSION sort_buffer_size = 10 * 1024 * 1024;</userinput>
+SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;
+SET SESSION sort_buffer_size = 10 * 1024 * 1024;
 </programlisting>
 
         <para>
@@ -2154,8 +2154,8 @@
         </para>
 
         <para>
-          The variables that can be set at runtime are listed in
-          <xref linkend="dynamic-system-variables"/>.
+          <xref linkend="dynamic-system-variables"/>, lists the
+          variables that can be set at runtime.
         </para>
 
         <para>
@@ -2178,204 +2178,44 @@
 
 <programlisting>
 mysql&gt; <userinput>SHOW VARIABLES;</userinput>
-+---------------------------------+---------------------------------------------------------+
-| Variable_name                   | Value                                                   |
-+---------------------------------+---------------------------------------------------------+
-| back_log                        | 50                                                      |
-| basedir                         | /usr/local/mysql                                        |
-| bdb_cache_size                  | 8388600                                                 |
-| bdb_home                        | /usr/local/mysql                                        |
-| bdb_log_buffer_size             | 32768                                                   |
-| bdb_logdir                      |                                                         |
-| bdb_max_lock                    | 10000                                                   |
-| bdb_shared_data                 | OFF                                                     |
-| bdb_tmpdir                      | /tmp/                                                   |
-| binlog_cache_size               | 32768                                                   |
-| bulk_insert_buffer_size         | 8388608                                                 |
-| character_set_client            | latin1                                                  |
-| character_set_connection        | latin1                                                  |
-| character_set_database          | latin1                                                  |
-| character_set_results           | latin1                                                  |
-| character_set_server            | latin1                                                  |
-| character_set_system            | utf8                                                    |
-| character_sets_dir              | /usr/local/mysql/share/charsets/                        |
-| collation_connection            | latin1_swedish_ci                                       |
-| collation_database              | latin1_swedish_ci                                       |
-| collation_server                | latin1_swedish_ci                                       |
-| concurrent_insert               | ON                                                      |
-| connect_timeout                 | 5                                                       |
-| datadir                         | /usr/local/mysql/data/                                          |
-| date_format                     | %Y-%m-%d                                                |
-| datetime_format                 | %Y-%m-%d %H:%i:%s                                       |
-| default_week_format             | 0                                                       |
-| delay_key_write                 | ON                                                      |
-| delayed_insert_limit            | 100                                                     |
-| delayed_insert_timeout          | 300                                                     |
-| delayed_queue_size              | 1000                                                    |
-| expire_logs_days                | 0                                                       |
-| flush                           | OFF                                                     |
-| flush_time                      | 1800                                                    |
-| ft_boolean_syntax               | + -&gt;&lt;()~*:""&amp;|                                          |
-| ft_max_word_len                 | 84                                                      |
-| ft_min_word_len                 | 4                                                       |
-| ft_query_expansion_limit        | 20                                                      |
-| ft_stopword_file                | (built-in)                                              |
-| group_concat_max_len            | 1024                                                    |
-| have_archive                    | NO                                                      |
-| have_bdb                        | YES                                                     |
-| have_blackhole_engine           | NO                                                      |
-| have_compress                   | YES                                                     |
-| have_crypt                      | NO                                                      |
-| have_csv                        | NO                                                      |
-| have_example_engine             | NO                                                      |
-| have_geometry                   | YES                                                     |
-| have_innodb                     | YES                                                     |
-| have_isam                       | NO                                                      |
-| have_ndbcluster                 | NO                                                      |
-| have_openssl                    | NO                                                      |
-| have_query_cache                | YES                                                     |
-| have_raid                       | NO                                                      |
-| have_rtree_keys                 | YES                                                     |
-| have_symlink                    | YES                                                     |
-| init_connect                    |                                                         |
-| init_file                       |                                                         |
-| init_slave                      |                                                         |
-| innodb_additional_mem_pool_size | 1048576                                                 |
-| innodb_autoextend_increment     | 8                                                       |
-| innodb_buffer_pool_awe_mem_mb   | 0                                                       |
-| innodb_buffer_pool_size         | 8388608                                                 |
-| innodb_data_file_path           | ibdata1:10M:autoextend                                  |
-| innodb_data_home_dir            |                                                         |
-| innodb_fast_shutdown            | ON                                                      |
-| innodb_file_io_threads          | 4                                                       |
-| innodb_file_per_table           | OFF                                                     |
-| innodb_flush_log_at_trx_commit  | 1                                                       |
-| innodb_flush_method             |                                                         |
-| innodb_force_recovery           | 0                                                       |
-| innodb_lock_wait_timeout        | 50                                                      |
-| innodb_locks_unsafe_for_binlog  | OFF                                                     |
-| innodb_log_arch_dir             |                                                         |
-| innodb_log_archive              | OFF                                                     |
-| innodb_log_buffer_size          | 1048576                                                 |
-| innodb_log_file_size            | 5242880                                                 |
-| innodb_log_files_in_group       | 2                                                       |
-| innodb_log_group_home_dir       | ./                                                      |
-| innodb_max_dirty_pages_pct      | 90                                                      |
-| innodb_max_purge_lag            | 0                                                       |
-| innodb_mirrored_log_groups      | 1                                                       |
-| innodb_open_files               | 300                                                     |
-| innodb_table_locks              | ON                                                      |
-| innodb_thread_concurrency       | 8                                                       |
-| interactive_timeout             | 28800                                                   |
-| join_buffer_size                | 131072                                                  |
-| key_buffer_size                 | 16777216                                                |
-| key_cache_age_threshold         | 300                                                     |
-| key_cache_block_size            | 1024                                                    |
-| key_cache_division_limit        | 100                                                     |
-| language                        | /usr/local/mysql/share/english/                         |
-| large_files_support             | ON                                                      |
-| license                         | GPL                                                     |
-| local_infile                    | ON                                                      |
-| log                             | ON                                                      |
-| log_bin                         | ON                                                      |
-| log_error                       | ./megalon.err                                           |
-| log_slave_updates               | OFF                                                     |
-| log_slow_queries                | OFF                                                     |
-| log_update                      | OFF                                                     |
-| log_warnings                    | 1                                                       |
-| long_query_time                 | 10                                                      |
-| low_priority_updates            | OFF                                                     |
-| lower_case_file_system          | OFF                                                     |
-| lower_case_table_names          | 1                                                       |
-| max_allowed_packet              | 1048576                                                 |
-| max_binlog_cache_size           | 4294967295                                              |
-| max_binlog_size                 | 1073741824                                              |
-| max_connect_errors              | 10                                                      |
-| max_connections                 | 100                                                     |
-| max_delayed_threads             | 20                                                      |
-| max_error_count                 | 64                                                      |
-| max_heap_table_size             | 16777216                                                |
-| max_insert_delayed_threads      | 20                                                      |
-| max_join_size                   | 4294967295                                              |
-| max_length_for_sort_data        | 1024                                                    |
-| max_relay_log_size              | 0                                                       |
-| max_seeks_for_key               | 4294967295                                              |
-| max_sort_length                 | 1024                                                    |
-| max_tmp_tables                  | 32                                                      |
-| max_user_connections            | 0                                                       |
-| max_write_lock_count            | 4294967295                                              |
-| myisam_data_pointer_size        | 4                                                       |
-| myisam_max_extra_sort_file_size | 2147483648                                              |
-| myisam_max_sort_file_size       | 2147483647                                              |
-| myisam_recover_options          | OFF                                                     |
-| myisam_repair_threads           | 1                                                       |
-| myisam_sort_buffer_size         | 8388608                                                 |
-| named_pipe                      | OFF                                                     |
-| net_buffer_length               | 16384                                                   |
-| net_read_timeout                | 30                                                      |
-| net_retry_count                 | 10                                                      |
-| net_write_timeout               | 60                                                      |
-| new                             | OFF                                                     |
-| old_passwords                   | OFF                                                     |
-| open_files_limit                | 510                                                     |
-| pid_file                        | /usr/local/mysql/megalon.pid                            |
-| port                            | 3306                                                    |
-| preload_buffer_size             | 32768                                                   |
-| protocol_version                | 10                                                      |
-| query_alloc_block_size          | 8192                                                    |
-| query_cache_limit               | 1048576                                                 |
-| query_cache_min_res_unit        | 4096                                                    |
-| query_cache_size                | 0                                                       |
-| query_cache_type                | ON                                                      |
-| query_cache_wlock_invalidate    | OFF                                                     |
-| query_prealloc_size             | 8192                                                    |
-| range_alloc_block_size          | 2048                                                    |
-| read_buffer_size                | 131072                                                  |
-| read_only                       | OFF                                                     |
-| read_rnd_buffer_size            | 262144                                                  |
-| relay_log_purge                 | ON                                                      |
-| relay_log_space_limit           | 0                                                       |
-| rpl_recovery_rank               | 0                                                       |
-| secure_auth                     | OFF                                                     |
-| shared_memory                   | OFF                                                     |
-| shared_memory_base_name         | MYSQL                                                   |
-| server_id                       | 1                                                       |
-| skip_external_locking           | ON                                                      |
-| skip_networking                 | OFF                                                     |
-| skip_show_database              | OFF                                                     |
-| slave_net_timeout               | 3600                                                    |
-| slave_transaction_retries       | 0                                                       |
-| slow_launch_time                | 2                                                       |
-| sort_buffer_size                | 2097144                                                 |
-| sql_mode                        |                                                         |
-| storage_engine                  | MyISAM                                                  |
-| sql_notes                       | ON                                                      |
-| sql_warnings                    | ON                                                      |
-| sync_binlog                     | 0                                                       |
-| sync_replication                | 0                                                       |
-| sync_replication_slave_id       | 0                                                       |
-| sync_replication_timeout        | 0                                                       |
-| sync_frm                        | ON                                                      |
-| system_time_zone                | E. Australia Standard Time                              |
-| table_cache                     | 64                                                      |
-| table_type                      | MyISAM                                                  |
-| thread_cache_size               | 0                                                       |
-| thread_stack                    | 196608                                                  |
-| time_format                     | %H:%i:%s                                                |
-| time_zone                       | SYSTEM                                                  |
-| tmp_table_size                  | 33554432                                                |
-| tmpdir                          |                                                         |
-| transaction_alloc_block_size    | 8192                                                    |
-| transaction_prealloc_size       | 4096                                                    |
-| tx_isolation                    | REPEATABLE-READ                                         |
-| version                         | 4.1.13-max-log                                          |
-| version_bdb                     | Sleepycat Software: Berkeley DB 4.1.24: (July 28, 2005) |
-| version_comment                 | MySQL Community Edition - Max (GPL)                     |
-| version_compile_machine         | i686                                                    |
-| version_compile_os              | pc-linux-gnu                                            |
-| wait_timeout                    | 28800                                                   |
-+---------------------------------+---------------------------------------------------------+
-193 rows in set (0.00 sec)
++---------------------------------+-------------------------------------+
+| Variable_name                   | Value                               |
++---------------------------------+-------------------------------------+
+| back_log                        | 50                                  |
+| basedir                         | /usr/local/mysql                    |
+| bdb_cache_size                  | 8388600                             |
+| bdb_home                        | /usr/local/mysql                    |
+| bdb_log_buffer_size             | 32768                               |
+| bdb_logdir                      |                                     |
+| bdb_max_lock                    | 10000                               |
+| bdb_shared_data                 | OFF                                 |
+| bdb_tmpdir                      | /tmp/                               |
+| binlog_cache_size               | 32768                               |
+| bulk_insert_buffer_size         | 8388608                             |
+| character_set_client            | latin1                              |
+| character_set_connection        | latin1                              |
+| character_set_database          | latin1                              |
+| character_set_results           | latin1                              |
+| character_set_server            | latin1                              |
+| character_set_system            | utf8                                |
+| character_sets_dir              | /usr/local/mysql/share/charsets/    |
+| collation_connection            | latin1_swedish_ci                   |
+| collation_database              | latin1_swedish_ci                   |
+| collation_server                | latin1_swedish_ci                   |
+...
+| innodb_additional_mem_pool_size | 1048576                             |
+| innodb_autoextend_increment     | 8                                   |
+| innodb_buffer_pool_awe_mem_mb   | 0                                   |
+| innodb_buffer_pool_size         | 8388608                             |
+| innodb_data_file_path           | ibdata1:10M:autoextend              |
+| innodb_data_home_dir            |                                     |
+...
+| version                         | 4.1.13-max-log                      |
+| version_comment                 | MySQL Community Edition - Max (GPL) |
+| version_compile_machine         | i686                                |
+| version_compile_os              | pc-linux-gnu                        |
+| wait_timeout                    | 28800                               |
++---------------------------------+-------------------------------------+
 </programlisting>
 
         <indexterm>
@@ -2440,9 +2280,9 @@
               its own limit on the size of this queue. The manual page
               for the Unix <literal>listen()</literal> system call
               should have more details. Check your OS documentation for
-              the maximum value for this variable. Attempting to set
-              <literal>back_log</literal> higher than your operating
-              system limit is ineffective.
+              the maximum value for this variable.
+              <literal>back_log</literal> cannot be set higher than your
+              operating system limit.
             </para>
           </listitem>
 
@@ -2467,7 +2307,7 @@
               indexes and rows for <literal>BDB</literal> tables. If you
               do not use <literal>BDB</literal> tables, you should start
               <command>mysqld</command> with <option>--skip-bdb</option>
-              to not waste memory for this cache. This variable was
+              to not allocate memory for this cache. This variable was
               added in MySQL 3.23.14.
             </para>
           </listitem>
@@ -2495,8 +2335,9 @@
               indexes and rows for <literal>BDB</literal> tables. If you
               do not use <literal>BDB</literal> tables, you should set
               this to 0 or start <command>mysqld</command> with
-              <option>--skip-bdb</option> in order not to waste memory
-              for this cache. This variable was added in MySQL 3.23.31.
+              <option>--skip-bdb</option> in order not to allocate
+              memory for this cache. This variable was added in MySQL
+              3.23.31.
             </para>
           </listitem>
 
@@ -2519,10 +2360,10 @@
             </para>
 
             <para>
-              The maximum number of locks you can have active on a
+              The maximum number of locks that can be active for a
               <literal>BDB</literal> table (10,000 by default). You
-              should increase this if errors such as the following occur
-              when you perform long transactions or when
+              should increase this value if errors such as the following
+              occur when you perform long transactions or when
               <command>mysqld</command> has to examine many rows to
               calculate a query:
             </para>
@@ -2544,8 +2385,10 @@
 
             <para>
               This is <literal>ON</literal> if you are using
-              <option>--bdb-shared-data</option>. This variable was
-              added in MySQL 3.23.29.
+              <option>--bdb-shared-data</option> to start Berkeley DB in
+              multi-process mode. (Do not use
+              <literal>DB_PRIVATE</literal> when initializing Berkeley
+              DB.) This variable was added in MySQL 3.23.29.
             </para>
           </listitem>
 
@@ -2555,8 +2398,8 @@
             </para>
 
             <para>
-              The value of the <option>--bdb-tmpdir</option> option.
-              This variable was added in MySQL 3.23.14.
+              The <literal>BDB</literal> temporary file directory. This
+              variable was added in MySQL 3.23.14.
             </para>
           </listitem>
 
@@ -2580,10 +2423,10 @@
               binary log during a transaction. A binary log cache is
               allocated for each client if the server supports any
               transactional storage engines and, starting from MySQL
-              4.1.2, if the server has binary log enabled
+              4.1.2, if the server has the binary log enabled
               (<option>--log-bin</option> option). If you often use
               large, multiple-statement transactions, you can increase
-              this to get more performance. The
+              this cache size to get more performance. The
               <literal>Binlog_cache_use</literal> and
               <literal>Binlog_cache_disk_use</literal> status variables
               can be useful for tuning the size of this variable. This
@@ -2601,13 +2444,12 @@
               <literal>MyISAM</literal> uses a special tree-like cache
               to make bulk inserts faster for <literal>INSERT ...
               SELECT</literal>, <literal>INSERT ... VALUES (...), (...),
-              ...</literal>, and <literal>LOAD DATA INFILE</literal>.
-              This variable limits the size of the cache tree in bytes
-              per thread. Setting it to 0 disables this optimization.
-              <emphasis role="bold">Note</emphasis>: This cache is used
-              only when adding data to a non-empty table. The default
-              value is 8MB. This variable was added in MySQL 4.0.3. This
-              variable previously was named
+              ...</literal>, and <literal>LOAD DATA INFILE</literal>
+              when adding data to non-empty tables. This variable limits
+              the size of the cache tree in bytes per thread. Setting it
+              to 0 disables this optimization. The default value is 8MB.
+              This variable was added in MySQL 4.0.3. This variable
+              previously was named
               <literal>myisam_bulk_insert_tree_size</literal>.
             </para>
           </listitem>
@@ -2788,8 +2630,8 @@
             </para>
 
             <para>
-              The number of seconds the <command>mysqld</command> server
-              waits for a connect packet before responding with
+              The number of seconds that the <command>mysqld</command>
+              server waits for a connect packet before responding with
               <literal>Bad handshake</literal>.
             </para>
           </listitem>
@@ -2844,8 +2686,9 @@
 
             <para>
               The default mode value to use for the
-              <literal>WEEK()</literal> function. This variable is
-              available as of MySQL 4.0.14.
+              <literal>WEEK()</literal> function. See
+              <xref linkend="date-and-time-functions"/>. This variable
+              is available as of MySQL 4.0.14.
             </para>
           </listitem>
 
@@ -2877,9 +2720,9 @@
                   </row>
                   <row>
                     <entry><literal>ON</literal></entry>
-                    <entry>MySQL honors the <literal>DELAY_KEY_WRITE</literal> option for
-                      <literal>CREATE TABLE</literal>. This is the
-                      default value.</entry>
+                    <entry>MySQL honors any <literal>DELAY_KEY_WRITE</literal> option specified in
+                      <literal>CREATE TABLE</literal> statements. This
+                      is the default value.</entry>
                   </row>
                   <row>
                     <entry><literal>ALL</literal></entry>
@@ -2891,11 +2734,11 @@
             </informaltable>
 
             <para>
-              If <literal>DELAY_KEY_WRITE</literal> is enabled, this
-              means that the key buffer for tables with this option are
-              not flushed on every index update, but only when a table
-              is closed. This speeds up writes on keys a lot, but if you
-              use this feature, you should add automatic checking of all
+              If <literal>DELAY_KEY_WRITE</literal> is enabled for a
+              table, the key buffer is not flushed for the table on
+              every index update, but only when the table is closed.
+              This speeds up writes on keys a lot, but if you use this
+              feature, you should add automatic checking of all
               <literal>MyISAM</literal> tables by starting the server
               with the <option>--myisam-recover</option> option (for
               example, <option>--myisam-recover=BACKUP,FORCE</option>).
@@ -2905,9 +2748,9 @@
 
             <para>
               Note that enabling external locking with
-              <option>--external-locking</option> doesn't offer any
-              protection against index corruption for tables that use
-              delayed key writes.
+              <option>--external-locking</option> offers no protection
+              against index corruption for tables that use delayed key
+              writes.
             </para>
 
             <para>
@@ -2936,8 +2779,8 @@
             </para>
 
             <para>
-              How long an <literal>INSERT DELAYED</literal> handler
-              thread should wait for <literal>INSERT</literal>
+              How many seconds an <literal>INSERT DELAYED</literal>
+              handler thread should wait for <literal>INSERT</literal>
               statements before terminating.
             </para>
           </listitem>
@@ -7248,11 +7091,11 @@
               quote character (like the
               &lsquo;<literal>`</literal>&rsquo; quote character) and
               not as a string quote character. You can still use
-              &lsquo;<literal>`</literal>&rsquo; to quote identifiers in
-              ANSI mode. With <literal>ANSI_QUOTES</literal> enabled,
-              you cannot use double quotes to quote a literal string,
-              because it is interpreted as an identifier. (New in MySQL
-              4.0.0)
+              &lsquo;<literal>`</literal>&rsquo; to quote identifiers
+              with this mode enabled. With
+              <literal>ANSI_QUOTES</literal> enabled, you cannot use
+              double quotes to quote a literal string, because it is
+              interpreted as an identifier. (New in MySQL 4.0.0)
             </para>
           </listitem>
 
@@ -7347,23 +7190,6 @@
             </para>
           </listitem>
 
-<!--
-        <listitem>
-          <remark role="todo">
-            [js]  Does not appear to be available in 4.1?
-          </remark>
-          
-          <para>
-            <literal>NO_ENGINE_SUBSTITUTION</literal>
-          </para>
-
-          <para>
-            Prevents automatic substitution of storage engine when the
-            requested storage engine is disabled or not compiled in.
-          </para>
-        </listitem>
--->
-
           <listitem>
             <para>
               <indexterm>
@@ -7428,8 +7254,8 @@
             <para>
               In subtraction operations, do not mark the result as
               <literal>UNSIGNED</literal> if one of the operands is
-              unsigned. Note that this makes <literal>UNSIGNED
-              BIGINT</literal> not 100% usable in all contexts. See
+              unsigned. Note that this makes <literal>BIGINT
+              UNSIGNED</literal> not 100% usable in all contexts. See
               <xref linkend="cast-functions"/>. (New in MySQL 4.0.2)
             </para>
           </listitem>
@@ -7444,9 +7270,9 @@
             </para>
 
             <para>
-              Do not allow queries that in the <literal>GROUP
-              BY</literal> part refer to a not selected column. (New in
-              MySQL 4.0.0)
+              Do not allow queries for which the <literal>GROUP
+              BY</literal> clause refers to a column that is not present
+              in the output column list. (New in MySQL 4.0.0)
             </para>
           </listitem>
 
@@ -7478,7 +7304,8 @@
 
             <para>
               Treat <literal>REAL</literal> as a synonym for
-              <literal>FLOAT</literal> rather than as a synonym for
+              <literal>FLOAT</literal>. By default, MySQL treats
+              <literal>REAL</literal> as a synonym for
               <literal>DOUBLE</literal>. (New in MySQL 4.0.0)
             </para>
           </listitem>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-26 19:08:01 UTC (rev 1048)
+++ trunk/refman-5.0/database-administration.xml	2006-01-26 20:14:54 UTC (rev 1049)
@@ -2087,7 +2087,7 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SET sort_buffer_size = 10 * 1024 * 1024;</userinput>
+SET sort_buffer_size = 10 * 1024 * 1024;
 </programlisting>
 
         <para>
@@ -2097,8 +2097,8 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;</userinput>
-mysql&gt; <userinput>SET SESSION sort_buffer_size = 10 * 1024 * 1024;</userinput>
+SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;
+SET SESSION sort_buffer_size = 10 * 1024 * 1024;
 </programlisting>
 
         <para>
@@ -2107,8 +2107,8 @@
         </para>
 
         <para>
-          The variables that can be set at runtime are listed in
-          <xref linkend="dynamic-system-variables"/>.
+          <xref linkend="dynamic-system-variables"/>, lists the
+          variables that can be set at runtime.
         </para>
 
         <para>
@@ -2130,232 +2130,50 @@
 
 <programlisting>
 mysql&gt; <userinput>SHOW VARIABLES;</userinput>
-+---------------------------------+--------------------------------------------------------------+
-| Variable_name                   | Value                                                        |
-+---------------------------------+--------------------------------------------------------------+
-| auto_increment_increment        | 1                                                            |
-| auto_increment_offset           | 1                                                            |
-| automatic_sp_privileges         | ON                                                           |
-| back_log                        | 50                                                           |
-| basedir                         | /                                                            |
-| bdb_cache_size                  | 8388600                                                      |
-| bdb_home                        | /var/lib/mysql/                                              |
-| bdb_log_buffer_size             | 32768                                                        |
-| bdb_logdir                      |                                                              |
-| bdb_max_lock                    | 10000                                                        |
-| bdb_shared_data                 | OFF                                                          |
-| bdb_tmpdir                      | /tmp/                                                        |
-| binlog_cache_size               | 32768                                                        |
-| bulk_insert_buffer_size         | 8388608                                                      |
-| character_set_client            | latin1                                                       |
-| character_set_connection        | latin1                                                       |
-| character_set_database          | latin1                                                       |
-| character_set_results           | latin1                                                       |
-| character_set_server            | latin1                                                       |
-| character_set_system            | utf8                                                         |
-| character_sets_dir              | /usr/share/mysql/charsets/                                   |
-| collation_connection            | latin1_swedish_ci                                            |
-| collation_database              | latin1_swedish_ci                                            |
-| collation_server                | latin1_swedish_ci                                            |
-| completion_type                 | 0                                                            |
-| concurrent_insert               | 1                                                            |
-| connect_timeout                 | 5                                                            |
-| datadir                         | /var/lib/mysql/                                              |
-| date_format                     | %Y-%m-%d                                                     |
-| datetime_format                 | %Y-%m-%d %H:%i:%s                                            |
-| default_week_format             | 0                                                            |
-| delay_key_write                 | ON                                                           |
-| delayed_insert_limit            | 100                                                          |
-| delayed_insert_timeout          | 300                                                          |
-| delayed_queue_size              | 1000                                                         |
-| div_precision_increment         | 4                                                            |
-| engine_condition_pushdown       | OFF                                                          |
-| expire_logs_days                | 0                                                            |
-| flush                           | OFF                                                          |
-| flush_time                      | 0                                                            |
-| ft_boolean_syntax               | + -&gt;&lt;()~*:""&amp;|                                               |
-| ft_max_word_len                 | 84                                                           |
-| ft_min_word_len                 | 4                                                            |
-| ft_query_expansion_limit        | 20                                                           |
-| ft_stopword_file                | (built-in)                                                   |
-| group_concat_max_len            | 1024                                                         |
-| have_archive                    | YES                                                          |
-| have_bdb                        | YES                                                          |
-| have_blackhole_engine           | YES                                                          |
-| have_compress                   | YES                                                          |
-| have_crypt                      | YES                                                          |
-| have_csv                        | YES                                                          |
-| have_example_engine             | YES                                                          |
-| have_federated_engine           | YES                                                          |
-| have_geometry                   | YES                                                          |
-| have_innodb                     | YES                                                          |
-| have_isam                       | NO                                                           |
-| have_ndbcluster                 | DISABLED                                                     |
-| have_openssl                    | NO                                                           |
-| have_query_cache                | YES                                                          |
-| have_raid                       | NO                                                           |
-| have_rtree_keys                 | YES                                                          |
-| have_symlink                    | YES                                                          |
-| init_connect                    |                                                              |
-| init_file                       |                                                              |
-| init_slave                      |                                                              |
-| innodb_additional_mem_pool_size | 1048576                                                      |
-| innodb_autoextend_increment     | 8                                                            |
-| innodb_buffer_pool_awe_mem_mb   | 0                                                            |
-| innodb_buffer_pool_size         | 8388608                                                      |
-| innodb_checksums                | ON                                                           |
-| innodb_commit_concurrency       | 0                                                            |
-| innodb_concurrency_tickets      | 500                                                          |
-| innodb_data_file_path           | ibdata1:10M:autoextend                                       |
-| innodb_data_home_dir            |                                                              |
-| innodb_doublewrite              | ON                                                           |
-| innodb_fast_shutdown            | 1                                                            |
-| innodb_file_io_threads          | 4                                                            |
-| innodb_file_per_table           | OFF                                                          |
-| innodb_flush_log_at_trx_commit  | 1                                                            |
-| innodb_flush_method             |                                                              |
-| innodb_force_recovery           | 0                                                            |
-| innodb_lock_wait_timeout        | 50                                                           |
-| innodb_locks_unsafe_for_binlog  | OFF                                                          |
-| innodb_log_arch_dir             |                                                              |
-| innodb_log_archive              | OFF                                                          |
-| innodb_log_buffer_size          | 1048576                                                      |
-| innodb_log_file_size            | 5242880                                                      |
-| innodb_log_files_in_group       | 2                                                            |
-| innodb_log_group_home_dir       | ./                                                           |
-| innodb_max_dirty_pages_pct      | 90                                                           |
-| innodb_max_purge_lag            | 0                                                            |
-| innodb_mirrored_log_groups      | 1                                                            |
-| innodb_open_files               | 300                                                          |
-| innodb_support_xa               | ON                                                           |
-| innodb_sync_spin_loops          | 20                                                           |
-| innodb_table_locks              | ON                                                           |
-| innodb_thread_concurrency       | 20                                                           |
-| innodb_thread_sleep_delay       | 10000                                                        |
-| interactive_timeout             | 28800                                                        |
-| join_buffer_size                | 131072                                                       |
-| key_buffer_size                 | 8388600                                                      |
-| key_cache_age_threshold         | 300                                                          |
-| key_cache_block_size            | 1024                                                         |
-| key_cache_division_limit        | 100                                                          |
-| language                        | /usr/share/mysql/english/                                    |
-| large_files_support             | ON                                                           |
-| large_page_size                 | 0                                                            |
-| large_pages                     | OFF                                                          |
-| license                         | GPL                                                          |
-| local_infile                    | ON                                                           |
-| locked_in_memory                | OFF                                                          |
-| log                             | OFF                                                          |
-| log_bin                         | OFF                                                          |
-| log_bin_trust_function_creators | OFF                                                          |
-| log_error                       |                                                              |
-| log_slave_updates               | OFF                                                          |
-| log_slow_queries                | OFF                                                          |
-| log_warnings                    | 1                                                            |
-| long_query_time                 | 10                                                           |
-| low_priority_updates            | OFF                                                          |
-| lower_case_file_system          | OFF                                                          |
-| lower_case_table_names          | 0                                                            |
-| max_allowed_packet              | 1048576                                                      |
-| max_binlog_cache_size           | 4294967295                                                   |
-| max_binlog_size                 | 1073741824                                                   |
-| max_connect_errors              | 10                                                           |
-| max_connections                 | 100                                                          |
-| max_delayed_threads             | 20                                                           |
-| max_error_count                 | 64                                                           |
-| max_heap_table_size             | 16777216                                                     |
-| max_insert_delayed_threads      | 20                                                           |
-| max_join_size                   | 4294967295                                                   |
-| max_length_for_sort_data        | 1024                                                         |
-| max_relay_log_size              | 0                                                            |
-| max_seeks_for_key               | 4294967295                                                   |
-| max_sort_length                 | 1024                                                         |
-| max_tmp_tables                  | 32                                                           |
-| max_user_connections            | 0                                                            |
-| max_write_lock_count            | 4294967295                                                   |
-| multi_range_count               | 256                                                          |
-| myisam_data_pointer_size        | 6                                                            |
-| myisam_max_sort_file_size       | 2147483647                                                   |
-| myisam_recover_options          | OFF                                                          |
-| myisam_repair_threads           | 1                                                            |
-| myisam_sort_buffer_size         | 8388608                                                      |
-| ndb_autoincrement_prefetch_sz   | 32                                                           |
-| ndb_force_send                  | ON                                                           |
-| ndb_use_exact_count             | ON                                                           |
-| ndb_use_transactions            | ON                                                           |
-| ndb_cache_check_time            | 0                                                            |
-| net_buffer_length               | 16384                                                        |
-| net_read_timeout                | 30                                                           |
-| net_retry_count                 | 10                                                           |
-| net_write_timeout               | 60                                                           |
-| new                             | OFF                                                          |
-| old_passwords                   | OFF                                                          |
-| open_files_limit                | 1024                                                         |
-| optimizer_prune_level           | 1                                                            |
-| optimizer_search_depth          | 62                                                           |
-| pid_file                        | /var/lib/mysql/mothra.pid                                    |
-| port                            | 3306                                                         |
-| preload_buffer_size             | 32768                                                        |
-| protocol_version                | 10                                                           |
-| query_alloc_block_size          | 8192                                                         |
-| query_cache_limit               | 1048576                                                      |
-| query_cache_min_res_unit        | 4096                                                         |
-| query_cache_size                | 0                                                            |
-| query_cache_type                | ON                                                           |
-| query_cache_wlock_invalidate    | OFF                                                          |
-| query_prealloc_size             | 8192                                                         |
-| range_alloc_block_size          | 2048                                                         |
-| read_buffer_size                | 131072                                                       |
-| read_only                       | OFF                                                          |
-| read_rnd_buffer_size            | 262144                                                       |
-| relay_log_purge                 | ON                                                           |
-| relay_log_space_limit           | 0                                                            |
-| rpl_recovery_rank               | 0                                                            |
-| secure_auth                     | OFF                                                          |
-| server_id                       | 0                                                            |
-| skip_external_locking           | ON                                                           |
-| skip_networking                 | OFF                                                          |
-| skip_show_database              | OFF                                                          |
-| slave_compressed_protocol       | OFF                                                          |
-| slave_load_tmpdir               | /tmp/                                                        |
-| slave_net_timeout               | 3600                                                         |
-| slave_skip_errors               | OFF                                                          |
-| slave_transaction_retries       | 10                                                           |
-| slow_launch_time                | 2                                                            |
-| socket                          | /var/lib/mysql/mysql.sock                                    |
-| sort_buffer_size                | 2097144                                                      |
-| sql_mode                        |                                                              |
-| sql_notes                       | ON                                                           |
-| sql_warnings                    | ON                                                           |
-| storage_engine                  | MyISAM                                                       |
-| sync_binlog                     | 0                                                            |
-| sync_frm                        | ON                                                           |
-| sync_replication                | 0                                                            |
-| sync_replication_slave_id       | 0                                                            |
-| sync_replication_timeout        | 10                                                           |
-| system_time_zone                | EST                                                          |
-| table_cache                     | 64                                                           |
-| table_lock_wait_timeout         | 50                                                           |
-| table_type                      | MyISAM                                                       |
-| thread_cache_size               | 0                                                            |
-| thread_stack                    | 196608                                                       |
-| time_format                     | %H:%i:%s                                                     |
-| time_zone                       | SYSTEM                                                       |
-| timed_mutexes                   | OFF                                                          |
-| tmp_table_size                  | 33554432                                                     |
-| tmpdir                          |                                                              |
-| transaction_alloc_block_size    | 8192                                                         |
-| transaction_prealloc_size       | 4096                                                         |
-| tx_isolation                    | REPEATABLE-READ                                              |
-| updatable_views_with_limit      | YES                                                          |
-| version                         | 5.0.13-rc-Max                                                |
-| version_bdb                     | Sleepycat Software: Berkeley DB 4.1.24: (September 22, 2005) |
-| version_comment                 | MySQL Community Edition - Max (GPL)                          |
-| version_compile_machine         | i686                                                         |
-| version_compile_os              | pc-linux-gnu                                                 |
-| wait_timeout                    | 28800                                                        |
-+---------------------------------+--------------------------------------------------------------+
-221 rows in set (0.01 sec)
++--------+--------------------------------------------------------------+
+| Variable_name                   | Value                               |
++--------+--------------------------------------------------------------+
+| auto_increment_increment        | 1                                   |
+| auto_increment_offset           | 1                                   |
+| automatic_sp_privileges         | ON                                  |
+| back_log                        | 50                                  |
+| basedir                         | /                                   |
+| bdb_cache_size                  | 8388600                             |
+| bdb_home                        | /var/lib/mysql/                     |
+| bdb_log_buffer_size             | 32768                               |
+| bdb_logdir                      |                                     |
+| bdb_max_lock                    | 10000                               |
+| bdb_shared_data                 | OFF                                 |
+| bdb_tmpdir                      | /tmp/                               |
+| binlog_cache_size               | 32768                               |
+| bulk_insert_buffer_size         | 8388608                             |
+| character_set_client            | latin1                              |
+| character_set_connection        | latin1                              |
+| character_set_database          | latin1                              |
+| character_set_results           | latin1                              |
+| character_set_server            | latin1                              |
+| character_set_system            | utf8                                |
+| character_sets_dir              | /usr/share/mysql/charsets/          |
+| collation_connection            | latin1_swedish_ci                   |
+| collation_database              | latin1_swedish_ci                   |
+| collation_server                | latin1_swedish_ci                   |
+...
+| innodb_additional_mem_pool_size | 1048576                             |
+| innodb_autoextend_increment     | 8                                   |
+| innodb_buffer_pool_awe_mem_mb   | 0                                   |
+| innodb_buffer_pool_size         | 8388608                             |
+| innodb_checksums                | ON                                  |
+| innodb_commit_concurrency       | 0                                   |
+| innodb_concurrency_tickets      | 500                                 |
+| innodb_data_file_path           | ibdata1:10M:autoextend              |
+| innodb_data_home_dir            |                                     |
+...
+| version                         | 5.0.13-rc-Max                       |
+| version_comment                 | MySQL Community Edition - Max (GPL) |
+| version_compile_machine         | i686                                |
+| version_compile_os              | pc-linux-gnu                        |
+| wait_timeout                    | 28800                               |
++--------+--------------------------------------------------------------+
 </programlisting>
 
         <indexterm>
@@ -2409,15 +2227,15 @@
               columns. Both variables can be set globally or locally,
               and each can assume an integer value between 1 and 65,535
               inclusive. Setting the value of either of these two
-              variables to 0 will cause its value to be set to 1
-              instead. Attempting to set the value of either of these
-              two variables to an integer greater than 65,535 or less
-              than 0 will cause its value to be set to 65,535 instead.
-              Attempting to set the value of
-              <literal>auto_increment_increment</literal> or of
+              variables to 0 causes its value to be set to 1 instead.
+              Attempting to set the value of either of these two
+              variables to an integer greater than 65,535 or less than 0
+              causes its value to be set to 65,535 instead. Attempting
+              to set the value of
+              <literal>auto_increment_increment</literal> or
               <literal>auto_increment_offset</literal> to a non-integer
               value gives rise to an error, and the actual value of the
-              variable remains unchanged in such a case.
+              variable remains unchanged.
             </para>
 
             <para>
@@ -2431,8 +2249,8 @@
               <listitem>
                 <para>
                   <literal>auto_increment_increment</literal> controls
-                  the interval by which the column value is incremented.
-                  For example:
+                  the interval between successive column values. For
+                  example:
                 </para>
 
 <programlisting>
@@ -2489,9 +2307,10 @@
                   <literal>auto_increment_offset</literal> determines
                   the starting point for the
                   <literal>AUTO_INCREMENT</literal> column value.
-                  Consider the following, assuming that these commands
-                  are executed during the same session as the previous
-                  example:
+                  Consider the following, assuming that these statements
+                  are executed during the same session as the example
+                  given in the description for
+                  <literal>auto_increment_increment</literal>:
                 </para>
 
 <programlisting>
@@ -2531,8 +2350,8 @@
                   If the value of
                   <literal>auto_increment_offset</literal> is greater
                   than that of
-                  <literal>auto_increment_increment</literal>, then the
-                  value of <literal>auto_increment_offset</literal> is
+                  <literal>auto_increment_increment</literal>, the value
+                  of <literal>auto_increment_offset</literal> is
                   ignored.
                 </para>
               </listitem>
@@ -2543,7 +2362,7 @@
               Should one or both of these variables be changed and then
               new rows inserted into a table containing an
               <literal>AUTO_INCREMENT</literal> column, the results may
-              seem counterintuitive, as the series of
+              seem counterintuitive because the series of
               <literal>AUTO_INCREMENT</literal> values is calculated
               without regard to any values already present in the
               column, and the next value inserted is the least value in
@@ -2554,7 +2373,7 @@
 
             <para>
               <literal>auto_increment_offset +
-              <replaceable>N</replaceable> *
+              <replaceable>N</replaceable> &times;
               auto_increment_increment</literal>
             </para>
 
@@ -2608,9 +2427,9 @@
               The values shown for
               <literal>auto_increment_increment</literal> and
               <literal>auto_increment_offset</literal> generate the
-              series 5 + <replaceable>N</replaceable> * 10, that is, [5,
-              15, 25, 35, 45, ...]. The greatest value present in the
-              <literal>col</literal> column prior to the
+              series 5 + <replaceable>N</replaceable> &times; 10, that
+              is, [5, 15, 25, 35, 45, ...]. The greatest value present
+              in the <literal>col</literal> column prior to the
               <literal>INSERT</literal> is 31, and the next available
               value in the <literal>AUTO_INCREMENT</literal> series is
               35, so the inserted values for <literal>col</literal>
@@ -2626,8 +2445,8 @@
               systems; these variables control the behavior of all
               <literal>AUTO_INCREMENT</literal> columns in
               <emphasis role="bold">all</emphasis> tables on the MySQL
-              server. If one of these variables is set globally, then
-              its effects persist until the global value is changed or
+              server. If one of these variables is set globally, its
+              effects persist until the global value is changed or
               overridden by setting them locally, or until
               <command>mysqld</command> is restarted. If set locally,
               the new value affects <literal>AUTO_INCREMENT</literal>
@@ -2679,9 +2498,9 @@
               its own limit on the size of this queue. The manual page
               for the Unix <literal>listen()</literal> system call
               should have more details. Check your OS documentation for
-              the maximum value for this variable. Attempting to set
-              <literal>back_log</literal> higher than your operating
-              system limit is ineffective.
+              the maximum value for this variable.
+              <literal>back_log</literal> cannot be set higher than your
+              operating system limit.
             </para>
           </listitem>
 
@@ -2706,7 +2525,7 @@
               indexes and rows for <literal>BDB</literal> tables. If you
               don't use <literal>BDB</literal> tables, you should start
               <command>mysqld</command> with <option>--skip-bdb</option>
-              to not waste memory for this cache.
+              to not allocate memory for this cache.
             </para>
           </listitem>
 
@@ -2732,8 +2551,8 @@
               indexes and rows for <literal>BDB</literal> tables. If you
               don't use <literal>BDB</literal> tables, you should set
               this to 0 or start <command>mysqld</command> with
-              <option>--skip-bdb</option> to not waste memory for this
-              cache.
+              <option>--skip-bdb</option> to not allocate memory for
+              this cache.
             </para>
           </listitem>
 
@@ -2755,10 +2574,10 @@
             </para>
 
             <para>
-              The maximum number of locks you can have active on a
+              The maximum number of locks that can be active for a
               <literal>BDB</literal> table (10,000 by default). You
-              should increase this if errors such as the following occur
-              when you perform long transactions or when
+              should increase this value if errors such as the following
+              occur when you perform long transactions or when
               <command>mysqld</command> has to examine many rows to
               calculate a query:
             </para>
@@ -2776,7 +2595,10 @@
 
             <para>
               This is <literal>ON</literal> if you are using
-              <option>--bdb-shared-data</option>.
+              <option>--bdb-shared-data</option> to start Berkeley DB in
+              multi-process mode. (Do not use
+              <literal>DB_PRIVATE</literal> when initializing Berkeley
+              DB.)
             </para>
           </listitem>
 
@@ -2786,7 +2608,7 @@
             </para>
 
             <para>
-              The value of the <option>--bdb-tmpdir</option> option.
+              The <literal>BDB</literal> temporary file directory.
             </para>
           </listitem>
 
@@ -2799,10 +2621,10 @@
               The size of the cache to hold the SQL statements for the
               binary log during a transaction. A binary log cache is
               allocated for each client if the server supports any
-              transactional storage engines and if the server has binary
-              log enabled (<option>--log-bin</option> option). If you
-              often use big, multiple-statement transactions, you can
-              increase this to get more performance. The
+              transactional storage engines and if the server has the
+              binary log enabled (<option>--log-bin</option> option). If
+              you often use large, multiple-statement transactions, you
+              can increase this cache size to get more performance. The
               <literal>Binlog_cache_use</literal> and
               <literal>Binlog_cache_disk_use</literal> status variables
               can be useful for tuning the size of this variable. See
@@ -2819,12 +2641,10 @@
               <literal>MyISAM</literal> uses a special tree-like cache
               to make bulk inserts faster for <literal>INSERT ...
               SELECT</literal>, <literal>INSERT ... VALUES (...), (...),
-              ...</literal>, and <literal>LOAD DATA INFILE</literal>.
-              This variable limits the size of the cache tree in bytes
-              per thread. Setting it to 0 disables this optimization.
-              <emphasis role="bold">Note</emphasis>: This cache is used
-              only when adding data to a non-empty table. The default
-              value is 8MB.
+              ...</literal>, and <literal>LOAD DATA INFILE</literal>
+              when adding data to non-empty tables. This variable limits
+              the size of the cache tree in bytes per thread. Setting it
+              to 0 disables this optimization. The default value is 8MB.
             </para>
           </listitem>
 
@@ -3007,8 +2827,8 @@
             </para>
 
             <para>
-              In MySQL 5.0.6, this variable was changed to an integer
-              that takes 3 values:
+              In MySQL 5.0.6, this variable was changed to take three
+              integer values:
             </para>
 
             <informaltable>
@@ -3034,8 +2854,8 @@
                     <entry>Enables concurrent inserts for all <literal>MyISAM</literal> tables. If
                       table has a hole and is in use by another thread
                       the new row will be inserted at end of table. If
-                      table is not in use then MySQL will do a normal
-                      read lock and insert the new row into the hole.</entry>
+                      table is not in use then MySQL does a normal read
+                      lock and inserts the new row into the hole.</entry>
                   </row>
                 </tbody>
               </tgroup>
@@ -3056,8 +2876,8 @@
             </para>
 
             <para>
-              The number of seconds the <command>mysqld</command> server
-              waits for a connect packet before responding with
+              The number of seconds that the <command>mysqld</command>
+              server waits for a connect packet before responding with
               <literal>Bad handshake</literal>.
             </para>
           </listitem>
@@ -3100,7 +2920,8 @@
 
             <para>
               The default mode value to use for the
-              <literal>WEEK()</literal> function.
+              <literal>WEEK()</literal> function. See
+              <xref linkend="date-and-time-functions"/>.
             </para>
           </listitem>
 
@@ -3132,9 +2953,9 @@
                   </row>
                   <row>
                     <entry><literal>ON</literal></entry>
-                    <entry>MySQL honors the <literal>DELAY_KEY_WRITE</literal> option for
-                      <literal>CREATE TABLE</literal>. This is the
-                      default value.</entry>
+                    <entry>MySQL honors any <literal>DELAY_KEY_WRITE</literal> option specified in
+                      <literal>CREATE TABLE</literal> statements. This
+                      is the default value.</entry>
                   </row>
                   <row>
                     <entry><literal>ALL</literal></entry>
@@ -3146,11 +2967,11 @@
             </informaltable>
 
             <para>
-              If <literal>DELAY_KEY_WRITE</literal> is enabled, this
-              means that the key buffer for tables with this option are
-              not flushed on every index update, but only when a table
-              is closed. This speeds up writes on keys a lot, but if you
-              use this feature, you should add automatic checking of all
+              If <literal>DELAY_KEY_WRITE</literal> is enabled for a
+              table, the key buffer is not flushed for the table on
+              every index update, but only when the table is closed.
+              This speeds up writes on keys a lot, but if you use this
+              feature, you should add automatic checking of all
               <literal>MyISAM</literal> tables by starting the server
               with the <option>--myisam-recover</option> option (for
               example, <option>--myisam-recover=BACKUP,FORCE</option>).
@@ -3160,9 +2981,9 @@
 
             <para>
               Note that enabling external locking with
-              <option>--external-locking</option> doesn't offer any
-              protection against index corruption for tables that use
-              delayed key writes.
+              <option>--external-locking</option> offers no protection
+              against index corruption for tables that use delayed key
+              writes.
             </para>
           </listitem>
 
@@ -3187,8 +3008,8 @@
             </para>
 
             <para>
-              How long an <literal>INSERT DELAYED</literal> handler
-              thread should wait for <literal>INSERT</literal>
+              How many seconds an <literal>INSERT DELAYED</literal>
+              handler thread should wait for <literal>INSERT</literal>
               statements before terminating.
             </para>
           </listitem>
@@ -3251,15 +3072,16 @@
               This variable applies to NDB. By default it is 0
               (<literal>OFF</literal>): If you execute a query such as
               <literal>SELECT * FROM t WHERE mycol = 42</literal>, where
-              <literal>mycol</literal> is an non-indexed column, the
+              <literal>mycol</literal> is a non-indexed column, the
               query is executed as a full table scan on every NDB node.
               Each node sends every row to the MySQL server, which
               applies the <literal>WHERE</literal> condition. If
               <literal>engine_condition_pushdown</literal> is set to 1
               (<literal>ON</literal>), the condition is <quote>pushed
               down</quote> to the storage engine and sent to the NDB
-              nodes. Each node performs the scan, and only sends back to
-              the MySQL server the rows that match the condition.
+              nodes. Each node uses the condition to perform the scan,
+              and only sends back to the MySQL server the rows that
+              match the condition.
             </para>
 
             <para>
@@ -8216,10 +8038,11 @@
               quote character (like the
               &lsquo;<literal>`</literal>&rsquo; quote character) and
               not as a string quote character. You can still use
-              &lsquo;<literal>`</literal>&rsquo; to quote identifiers in
-              ANSI mode. With <literal>ANSI_QUOTES</literal> enabled,
-              you cannot use double quotes to quote a literal string,
-              because it is interpreted as an identifier.
+              &lsquo;<literal>`</literal>&rsquo; to quote identifiers
+              with this mode enabled. With
+              <literal>ANSI_QUOTES</literal> enabled, you cannot use
+              double quotes to quote a literal string, because it is
+              interpreted as an identifier.
             </para>
           </listitem>
 
@@ -8237,7 +8060,7 @@
               we encounter a division by zero (or
               <literal>MOD(X,0)</literal>) during an
               <literal>INSERT</literal> or <literal>UPDATE</literal>. If
-              this mode is not given, MySQL instead returns
+              this mode is not enabled, MySQL instead returns
               <literal>NULL</literal> for divisions by zero. If used in
               <literal>INSERT IGNORE</literal> or <literal>UPDATE
               IGNORE</literal>, MySQL generates a warning for divisions
@@ -8408,8 +8231,10 @@
             </para>
 
             <para>
-              Prevents automatic substitution of storage engine when the
-              requested storage engine is disabled or not compiled in.
+              Prevents automatic substitution of the default storage
+              engine when a statement such as <literal>CREATE
+              TABLE</literal> specifies a storage engine that is
+              disabled or not compiled in. (Implemented in MySQL 5.0.8)
             </para>
           </listitem>
 
@@ -8474,8 +8299,8 @@
             <para>
               In subtraction operations, don't mark the result as
               <literal>UNSIGNED</literal> if one of the operands is
-              unsigned. Note that this makes <literal>UNSIGNED
-              BIGINT</literal> not 100% usable in all contexts. See
+              unsigned. Note that this makes <literal>BIGINT
+              UNSIGNED</literal> not 100% usable in all contexts. See
               <xref linkend="cast-functions"/>.
             </para>
           </listitem>
@@ -8510,9 +8335,9 @@
             <para>
               In strict mode, don't accept dates where the month or day
               part is 0. If used with the <literal>IGNORE</literal>
-              option, we insert a <literal>'0000-00-00'</literal> date
-              for any such date. When not in strict mode, the date is
-              accepted but a warning is generated. (Added in MySQL
+              option, MySQL inserts a <literal>'0000-00-00'</literal>
+              date for any such date. When not in strict mode, the date
+              is accepted but a warning is generated. (Added in MySQL
               5.0.2)
             </para>
           </listitem>
@@ -8527,8 +8352,9 @@
             </para>
 
             <para>
-              Do not allow queries that in the <literal>GROUP
-              BY</literal> part refer to a column that is not selected.
+              Do not allow queries for which the <literal>GROUP
+              BY</literal> clause refers to a column that is not present
+              in the output column list.
             </para>
           </listitem>
 
@@ -8559,7 +8385,8 @@
 
             <para>
               Treat <literal>REAL</literal> as a synonym for
-              <literal>FLOAT</literal> rather than as a synonym for
+              <literal>FLOAT</literal>. By default, MySQL treats
+              <literal>REAL</literal> as a synonym for
               <literal>DOUBLE</literal>.
             </para>
           </listitem>
@@ -8657,7 +8484,7 @@
         <para>
           Strict mode disallows invalid date values such as
           <literal>'2004-04-31'</literal>. It does not disallow dates
-          with zero parts such as <literal>2004-04-00'</literal> or
+          with zero parts such as <literal>'2004-04-00'</literal> or
           <quote>zero</quote> dates. To disallow these as well, enable
           the <literal>NO_ZERO_IN_DATE</literal> and
           <literal>NO_ZERO_DATE</literal> SQL modes in addition to

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-26 19:08:01 UTC (rev 1048)
+++ trunk/refman-5.1/database-administration.xml	2006-01-26 20:14:54 UTC (rev 1049)
@@ -2084,7 +2084,7 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SET sort_buffer_size = 10 * 1024 * 1024;</userinput>
+SET sort_buffer_size = 10 * 1024 * 1024;
 </programlisting>
 
         <para>
@@ -2094,8 +2094,8 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;</userinput>
-mysql&gt; <userinput>SET SESSION sort_buffer_size = 10 * 1024 * 1024;</userinput>
+SET GLOBAL sort_buffer_size = 10 * 1024 * 1024;
+SET SESSION sort_buffer_size = 10 * 1024 * 1024;
 </programlisting>
 
         <para>
@@ -2104,8 +2104,8 @@
         </para>
 
         <para>
-          The variables that can be set at runtime are listed in
-          <xref linkend="dynamic-system-variables"/>.
+          <xref linkend="dynamic-system-variables"/>, lists the
+          variables that can be set at runtime.
         </para>
 
         <para>
@@ -2127,230 +2127,43 @@
 
 <programlisting>
 mysql&gt; <userinput>SHOW VARIABLES;</userinput>
-+---------------------------------+-------------------------------------------+
-| Variable_name                   | Value                                     |
-+---------------------------------+-------------------------------------------+
-| auto_increment_increment        | 1                                         |
-| auto_increment_offset           | 1                                         |
-| automatic_sp_privileges         | ON                                        |
-| back_log                        | 50                                        |
-| basedir                         | /home/jon/bin/mysql/                      |
-| binlog_cache_size               | 32768                                     |
-| bulk_insert_buffer_size         | 8388608                                   |
-| character_set_client            | latin1                                    |
-| character_set_connection        | latin1                                    |
-| character_set_database          | latin1                                    |
-| character_set_results           | latin1                                    |
-| character_set_server            | latin1                                    |
-| character_set_system            | utf8                                      |
-| character_sets_dir              | /home/jon/bin/mysql/share/mysql/charsets/ |
-| collation_connection            | latin1_swedish_ci                         |
-| collation_database              | latin1_swedish_ci                         |
-| collation_server                | latin1_swedish_ci                         |
-| completion_type                 | 0                                         |
-| concurrent_insert               | 1                                         |
-| connect_timeout                 | 5                                         |
-| datadir                         | /home/jon/bin/mysql/var/                  |
-| date_format                     | %Y-%m-%d                                  |
-| datetime_format                 | %Y-%m-%d %H:%i:%s                         |
-| default_week_format             | 0                                         |
-| delay_key_write                 | ON                                        |
-| delayed_insert_limit            | 100                                       |
-| delayed_insert_timeout          | 300                                       |
-| delayed_queue_size              | 1000                                      |
-| div_precision_increment         | 4                                         |
-| engine_condition_pushdown       | OFF                                       |
-| expire_logs_days                | 0                                         |
-| flush                           | OFF                                       |
-| flush_time                      | 0                                         |
-| ft_boolean_syntax               | + -&gt;&lt;()~*:""&amp;|                            |
-| ft_max_word_len                 | 84                                        |
-| ft_min_word_len                 | 4                                         |
-| ft_query_expansion_limit        | 20                                        |
-| ft_stopword_file                | (built-in)                                |
-| group_concat_max_len            | 1024                                      |
-| have_archive                    | YES                                       |
-| have_bdb                        | NO                                        |
-| have_blackhole_engine           | YES                                       |
-| have_compress                   | YES                                       |
-| have_crypt                      | YES                                       |
-| have_csv                        | YES                                       |
-| have_example_engine             | NO                                        |
-| have_federated_engine           | NO                                        |
-| have_geometry                   | YES                                       |
-| have_innodb                     | YES                                       |
-| have_isam                       | NO                                        |
-| have_ndbcluster                 | DISABLED                                  |
-| have_openssl                    | NO                                        |
-| have_partitioning               | YES                                       |
-| have_query_cache                | YES                                       |
-| have_raid                       | NO                                        |
-| have_rtree_keys                 | YES                                       |
-| have_symlink                    | YES                                       |
-| init_connect                    |                                           |
-| init_file                       |                                           |
-| init_slave                      |                                           |
-| innodb_additional_mem_pool_size | 1048576                                   |
-| innodb_autoextend_increment     | 8                                         |
-| innodb_buffer_pool_awe_mem_mb   | 0                                         |
-| innodb_buffer_pool_size         | 8388608                                   |
-| innodb_checksums                | ON                                        |
-| innodb_commit_concurrency       | 0                                         |
-| innodb_concurrency_tickets      | 500                                       |
-| innodb_data_file_path           | ibdata1:10M:autoextend                    |
-| innodb_data_home_dir            |                                           |
-| innodb_doublewrite              | ON                                        |
-| innodb_fast_shutdown            | 1                                         |
-| innodb_file_io_threads          | 4                                         |
-| innodb_file_per_table           | OFF                                       |
-| innodb_flush_log_at_trx_commit  | 1                                         |
-| innodb_flush_method             |                                           |
-| innodb_force_recovery           | 0                                         |
-| innodb_lock_wait_timeout        | 50                                        |
-| innodb_locks_unsafe_for_binlog  | OFF                                       |
-| innodb_log_arch_dir             |                                           |
-| innodb_log_archive              | OFF                                       |
-| innodb_log_buffer_size          | 1048576                                   |
-| innodb_log_file_size            | 5242880                                   |
-| innodb_log_files_in_group       | 2                                         |
-| innodb_log_group_home_dir       | ./                                        |
-| innodb_max_dirty_pages_pct      | 90                                        |
-| innodb_max_purge_lag            | 0                                         |
-| innodb_mirrored_log_groups      | 1                                         |
-| innodb_open_files               | 300                                       |
-| innodb_support_xa               | ON                                        |
-| innodb_sync_spin_loops          | 20                                        |
-| innodb_table_locks              | ON                                        |
-| innodb_thread_concurrency       | 20                                        |
-| innodb_thread_sleep_delay       | 10000                                     |
-| interactive_timeout             | 28800                                     |
-| join_buffer_size                | 131072                                    |
-| key_buffer_size                 | 8388600                                   |
-| key_cache_age_threshold         | 300                                       |
-| key_cache_block_size            | 1024                                      |
-| key_cache_division_limit        | 100                                       |
-| language                        | /home/jon/bin/mysql/share/mysql/english/  |
-| large_files_support             | ON                                        |
-| large_page_size                 | 0                                         |
-| large_pages                     | OFF                                       |
-| license                         | GPL                                       |
-| local_infile                    | ON                                        |
-| locked_in_memory                | OFF                                       |
-| log                             | ON                                        |
-| log_bin                         | ON                                        |
-| log_bin_trust_function_creators | OFF                                       |
-| log_error                       | /home/jon/bin/mysql/var/master1.err       |
-| log_slave_updates               | OFF                                       |
-| log_slow_queries                | OFF                                       |
-| log_warnings                    | 1                                         |
-| long_query_time                 | 10                                        |
-| low_priority_updates            | OFF                                       |
-| lower_case_file_system          | OFF                                       |
-| lower_case_table_names          | 0                                         |
-| max_allowed_packet              | 1048576                                   |
-| max_binlog_cache_size           | 4294967295                                |
-| max_binlog_size                 | 1073741824                                |
-| max_connect_errors              | 10                                        |
-| max_connections                 | 100                                       |
-| max_delayed_threads             | 20                                        |
-| max_error_count                 | 64                                        |
-| max_heap_table_size             | 16777216                                  |
-| max_insert_delayed_threads      | 20                                        |
-| max_join_size                   | 4294967295                                |
-| max_length_for_sort_data        | 1024                                      |
-| max_relay_log_size              | 0                                         |
-| max_seeks_for_key               | 4294967295                                |
-| max_sort_length                 | 1024                                      |
-| max_tmp_tables                  | 32                                        |
-| max_user_connections            | 0                                         |
-| max_write_lock_count            | 4294967295                                |
-| multi_range_count               | 256                                       |
-| myisam_data_pointer_size        | 6                                         |
-| myisam_max_sort_file_size       | 2147483647                                |
-| myisam_recover_options          | OFF                                       |
-| myisam_repair_threads           | 1                                         |
-| myisam_sort_buffer_size         | 8388608                                   |
-| ndb_autoincrement_prefetch_sz   | 32                                        |
-| ndb_cache_check_time            | 0                                         |
-| ndb_force_send                  | ON                                        |
-| ndb_index_stat_cache_entries    | 32                                        |
-| ndb_index_stat_enable           | ON                                        |
-| ndb_index_stat_update_freq      | 20                                        |
-| ndb_use_exact_count             | ON                                        |
-| ndb_use_transactions            | ON                                        |
-| net_buffer_length               | 16384                                     |
-| net_read_timeout                | 30                                        |
-| net_retry_count                 | 10                                        |
-| net_write_timeout               | 60                                        |
-| new                             | OFF                                       |
-| old_alter_table                 | OFF                                       |
-| old_passwords                   | OFF                                       |
-| open_files_limit                | 1024                                      |
-| optimizer_prune_level           | 1                                         |
-| optimizer_search_depth          | 62                                        |
-| pid_file                        | /home/jon/bin/mysql/var/hostname.pid1     |
-| port                            | 3306                                      |
-| preload_buffer_size             | 32768                                     |
-| protocol_version                | 10                                        |
-| query_alloc_block_size          | 8192                                      |
-| query_cache_limit               | 1048576                                   |
-| query_cache_min_res_unit        | 4096                                      |
-| query_cache_size                | 0                                         |
-| query_cache_type                | ON                                        |
-| query_cache_wlock_invalidate    | OFF                                       |
-| query_prealloc_size             | 8192                                      |
-| range_alloc_block_size          | 2048                                      |
-| read_buffer_size                | 131072                                    |
-| read_only                       | OFF                                       |
-| read_rnd_buffer_size            | 262144                                    |
-| relay_log_purge                 | ON                                        |
-| relay_log_space_limit           | 0                                         |
-| rpl_recovery_rank               | 0                                         |
-| secure_auth                     | OFF                                       |
-| server_id                       | 1                                         |
-| skip_external_locking           | ON                                        |
-| skip_networking                 | OFF                                       |
-| skip_show_database              | OFF                                       |
-| slave_compressed_protocol       | OFF                                       |
-| slave_load_tmpdir               | /tmp/                                     |
-| slave_net_timeout               | 3600                                      |
-| slave_skip_errors               | OFF                                       |
-| slave_transaction_retries       | 10                                        |
-| slow_launch_time                | 2                                         |
-| socket                          | /tmp/mysql.sock                           |
-| sort_buffer_size                | 2097144                                   |
-| sql_mode                        |                                           |
-| sql_notes                       | ON                                        |
-| sql_warnings                    | ON                                        |
-| storage_engine                  | MyISAM                                    |
-| sync_binlog                     | 0                                         |
-| sync_frm                        | ON                                        |
-| sync_replication                | 0                                         |
-| sync_replication_slave_id       | 0                                         |
-| sync_replication_timeout        | 10                                        |
-| system_time_zone                | EST                                       |
-| table_definition_cache          | 128                                       |
-| table_lock_wait_timeout         | 50                                        |
-| table_open_cache                | 64                                        |
-| table_type                      | MyISAM                                    |
-| thread_cache_size               | 0                                         |
-| thread_stack                    | 196608                                    |
-| time_format                     | %H:%i:%s                                  |
-| time_zone                       | SYSTEM                                    |
-| timed_mutexes                   | OFF                                       |
-| tmp_table_size                  | 33554432                                  |
-| tmpdir                          |                                           |
-| transaction_alloc_block_size    | 8192                                      |
-| transaction_prealloc_size       | 4096                                      |
-| tx_isolation                    | REPEATABLE-READ                           |
-| updatable_views_with_limit      | YES                                       |
-| version                         | 5.1.2-alpha-log                           |
-| version_comment                 | Source distribution                       |
-| version_compile_machine         | i686                                      |
-| version_compile_os              | suse-linux                                |
-| wait_timeout                    | 28800                                     |
-+---------------------------------+-------------------------------------------+
-218 rows in set (0.03 sec)
++---------------------------------+--------------------------------------+
+| Variable_name                   | Value                                |
++---------------------------------+--------------------------------------+
+| auto_increment_increment        | 1                                    |
+| auto_increment_offset           | 1                                    |
+| automatic_sp_privileges         | ON                                   |
+| back_log                        | 50                                   |
+| basedir                         | /home/jon/bin/mysql/                 |
+| binlog_cache_size               | 32768                                |
+| bulk_insert_buffer_size         | 8388608                              |
+| character_set_client            | latin1                               |
+| character_set_connection        | latin1                               |
+| character_set_database          | latin1                               |
+| character_set_results           | latin1                               |
+| character_set_server            | latin1                               |
+| character_set_system            | utf8                                 |
+| character_sets_dir              | /usr/bin/mysql/share/mysql/charsets/ |
+| collation_connection            | latin1_swedish_ci                    |
+| collation_database              | latin1_swedish_ci                    |
+| collation_server                | latin1_swedish_ci                    |
+...
+| innodb_additional_mem_pool_size | 1048576                              |
+| innodb_autoextend_increment     | 8                                    |
+| innodb_buffer_pool_awe_mem_mb   | 0                                    |
+| innodb_buffer_pool_size         | 8388608                              |
+| innodb_checksums                | ON                                   |
+| innodb_commit_concurrency       | 0                                    |
+| innodb_concurrency_tickets      | 500                                  |
+| innodb_data_file_path           | ibdata1:10M:autoextend               |
+| innodb_data_home_dir            |                                      |
+...
+| version                         | 5.1.2-alpha-log                      |
+| version_comment                 | Source distribution                  |
+| version_compile_machine         | i686                                 |
+| version_compile_os              | suse-linux                           |
+| wait_timeout                    | 28800                                |
++---------------------------------+--------------------------------------+
 </programlisting>
 
         <indexterm>
@@ -2405,15 +2218,15 @@
               columns. Both variables can be set globally or locally,
               and each can assume an integer value between 1 and 65,535
               inclusive. Setting the value of either of these two
-              variables to 0 will cause its value to be set to 1
-              instead. Attempting to set the value of either of these
-              two variables to an integer greater than 65,535 or less
-              than 0 will cause its value to be set to 65,535 instead.
-              Attempting to set the value of
-              <literal>auto_increment_increment</literal> or of
+              variables to 0 causes its value to be set to 1 instead.
+              Attempting to set the value of either of these two
+              variables to an integer greater than 65,535 or less than 0
+              causes its value to be set to 65,535 instead. Attempting
+              to set the value of
+              <literal>auto_increment_increment</literal> or
               <literal>auto_increment_offset</literal> to a non-integer
               value gives rise to an error, and the actual value of the
-              variable remains unchanged in such a case.
+              variable remains unchanged.
             </para>
 
             <para>
@@ -2427,8 +2240,8 @@
               <listitem>
                 <para>
                   <literal>auto_increment_increment</literal> controls
-                  the interval by which the column value is incremented.
-                  For example:
+                  the interval between successive column values. For
+                  example:
                 </para>
 
 <programlisting>
@@ -2485,9 +2298,10 @@
                   <literal>auto_increment_offset</literal> determines
                   the starting point for the
                   <literal>AUTO_INCREMENT</literal> column value.
-                  Consider the following, assuming that these commands
-                  are executed during the same session as the previous
-                  example:
+                  Consider the following, assuming that these statements
+                  are executed during the same session as the example
+                  given in the description for
+                  <literal>auto_increment_increment</literal>:
                 </para>
 
 <programlisting>
@@ -2527,8 +2341,8 @@
                   If the value of
                   <literal>auto_increment_offset</literal> is greater
                   than that of
-                  <literal>auto_increment_increment</literal>, then the
-                  value of <literal>auto_increment_offset</literal> is
+                  <literal>auto_increment_increment</literal>, the value
+                  of <literal>auto_increment_offset</literal> is
                   ignored.
                 </para>
               </listitem>
@@ -2539,7 +2353,7 @@
               Should one or both of these variables be changed and then
               new rows inserted into a table containing an
               <literal>AUTO_INCREMENT</literal> column, the results may
-              seem counterintuitive, as the series of
+              seem counterintuitive because the series of
               <literal>AUTO_INCREMENT</literal> values is calculated
               without regard to any values already present in the
               column, and the next value inserted is the least value in
@@ -2550,7 +2364,7 @@
 
             <para>
               <literal>auto_increment_offset +
-              <replaceable>N</replaceable> *
+              <replaceable>N</replaceable> &times;
               auto_increment_increment</literal>
             </para>
 
@@ -2604,9 +2418,9 @@
               The values shown for
               <literal>auto_increment_increment</literal> and
               <literal>auto_increment_offset</literal> generate the
-              series 5 + <replaceable>N</replaceable> * 10, that is, [5,
-              15, 25, 35, 45, ...]. The greatest value present in the
-              <literal>col</literal> column prior to the
+              series 5 + <replaceable>N</replaceable> &times; 10, that
+              is, [5, 15, 25, 35, 45, ...]. The greatest value present
+              in the <literal>col</literal> column prior to the
               <literal>INSERT</literal> is 31, and the next available
               value in the <literal>AUTO_INCREMENT</literal> series is
               35, so the inserted values for <literal>col</literal>
@@ -2622,8 +2436,8 @@
               systems; these variables control the behavior of all
               <literal>AUTO_INCREMENT</literal> columns in
               <emphasis role="bold">all</emphasis> tables on the MySQL
-              server. If one of these variables is set globally, then
-              its effects persist until the global value is changed or
+              server. If one of these variables is set globally, its
+              effects persist until the global value is changed or
               overridden by setting them locally, or until
               <command>mysqld</command> is restarted. If set locally,
               the new value affects <literal>AUTO_INCREMENT</literal>
@@ -2675,9 +2489,9 @@
               its own limit on the size of this queue. The manual page
               for the Unix <literal>listen()</literal> system call
               should have more details. Check your OS documentation for
-              the maximum value for this variable. Attempting to set
-              <literal>back_log</literal> higher than your operating
-              system limit is ineffective.
+              the maximum value for this variable.
+              <literal>back_log</literal> cannot be set higher than your
+              operating system limit.
             </para>
           </listitem>
 
@@ -2714,8 +2528,8 @@
               systems support setting this variable larger than 4GB. If
               you don't use <literal>BDB</literal> tables, you should
               start <command>mysqld</command> with
-              <option>--skip-bdb</option> to not waste memory for this
-              cache.
+              <option>--skip-bdb</option> to not allocate memory for
+              this cache.
             </para>
           </listitem>
 
@@ -2741,8 +2555,8 @@
               indexes and rows for <literal>BDB</literal> tables. If you
               don't use <literal>BDB</literal> tables, you should set
               this to 0 or start <command>mysqld</command> with
-              <option>--skip-bdb</option> to not waste memory for this
-              cache.
+              <option>--skip-bdb</option> to not allocate memory for
+              this cache.
             </para>
           </listitem>
 
@@ -2764,10 +2578,10 @@
             </para>
 
             <para>
-              The maximum number of locks you can have active on a
+              The maximum number of locks that can be active for a
               <literal>BDB</literal> table (10,000 by default). You
-              should increase this if errors such as the following occur
-              when you perform long transactions or when
+              should increase this value if errors such as the following
+              occur when you perform long transactions or when
               <command>mysqld</command> has to examine many rows to
               calculate a query:
             </para>
@@ -2798,7 +2612,10 @@
 
             <para>
               This is <literal>ON</literal> if you are using
-              <option>--bdb-shared-data</option>.
+              <option>--bdb-shared-data</option> to start Berkeley DB in
+              multi-process mode. (Do not use
+              <literal>DB_PRIVATE</literal> when initializing Berkeley
+              DB.)
             </para>
           </listitem>
 
@@ -2808,7 +2625,7 @@
             </para>
 
             <para>
-              The value of the <option>--bdb-tmpdir</option> option.
+              The <literal>BDB</literal> temporary file directory.
             </para>
           </listitem>
 
@@ -2821,10 +2638,10 @@
               The size of the cache to hold the SQL statements for the
               binary log during a transaction. A binary log cache is
               allocated for each client if the server supports any
-              transactional storage engines and if the server has binary
-              log enabled (<option>--log-bin</option> option). If you
-              often use big, multiple-statement transactions, you can
-              increase this to get more performance. The
+              transactional storage engines and if the server has the
+              binary log enabled (<option>--log-bin</option> option). If
+              you often use large, multiple-statement transactions, you
+              can increase this cache size to get more performance. The
               <literal>Binlog_cache_use</literal> and
               <literal>Binlog_cache_disk_use</literal> status variables
               can be useful for tuning the size of this variable. See
@@ -2841,7 +2658,8 @@
               The replication logging format, either
               <literal>STATEMENT</literal> or <literal>ROW</literal>.
               This variable is set by the
-              <option>--binlog-format</option> option.
+              <option>--binlog-format</option> option. See
+              <xref linkend="replication-row-based"/>.
             </para>
           </listitem>
 
@@ -2854,12 +2672,10 @@
               <literal>MyISAM</literal> uses a special tree-like cache
               to make bulk inserts faster for <literal>INSERT ...
               SELECT</literal>, <literal>INSERT ... VALUES (...), (...),
-              ...</literal>, and <literal>LOAD DATA INFILE</literal>.
-              This variable limits the size of the cache tree in bytes
-              per thread. Setting it to 0 disables this optimization.
-              <emphasis role="bold">Note</emphasis>: This cache is used
-              only when adding data to a non-empty table. The default
-              value is 8MB.
+              ...</literal>, and <literal>LOAD DATA INFILE</literal>
+              when adding data to non-empty tables. This variable limits
+              the size of the cache tree in bytes per thread. Setting it
+              to 0 disables this optimization. The default value is 8MB.
             </para>
           </listitem>
 
@@ -3038,7 +2854,7 @@
             </para>
 
             <para>
-              This variable is an integer that takes 3 values:
+              This variable can take three integer values:
             </para>
 
             <informaltable>
@@ -3064,8 +2880,8 @@
                     <entry>Enables concurrent inserts for all <literal>MyISAM</literal> tables. If
                       table has a hole and is in use by another thread
                       the new row will be inserted at end of table. If
-                      table is not in use then MySQL will do a normal
-                      read lock and insert the new row into the hole.</entry>
+                      table is not in use then MySQL does a normal read
+                      lock and inserts the new row into the hole.</entry>
                   </row>
                 </tbody>
               </tgroup>
@@ -3086,8 +2902,8 @@
             </para>
 
             <para>
-              The number of seconds the <command>mysqld</command> server
-              waits for a connect packet before responding with
+              The number of seconds that the <command>mysqld</command>
+              server waits for a connect packet before responding with
               <literal>Bad handshake</literal>.
             </para>
           </listitem>
@@ -3130,7 +2946,8 @@
 
             <para>
               The default mode value to use for the
-              <literal>WEEK()</literal> function.
+              <literal>WEEK()</literal> function. See
+              <xref linkend="date-and-time-functions"/>.
             </para>
           </listitem>
 
@@ -3162,9 +2979,9 @@
                   </row>
                   <row>
                     <entry><literal>ON</literal></entry>
-                    <entry>MySQL honors the <literal>DELAY_KEY_WRITE</literal> option for
-                      <literal>CREATE TABLE</literal>. This is the
-                      default value.</entry>
+                    <entry>MySQL honors any <literal>DELAY_KEY_WRITE</literal> option specified in
+                      <literal>CREATE TABLE</literal> statements. This
+                      is the default value.</entry>
                   </row>
                   <row>
                     <entry><literal>ALL</literal></entry>
@@ -3176,11 +2993,11 @@
             </informaltable>
 
             <para>
-              If <literal>DELAY_KEY_WRITE</literal> is enabled, this
-              means that the key buffer for tables with this option are
-              not flushed on every index update, but only when a table
-              is closed. This speeds up writes on keys a lot, but if you
-              use this feature, you should add automatic checking of all
+              If <literal>DELAY_KEY_WRITE</literal> is enabled for a
+              table, the key buffer is not flushed for the table on
+              every index update, but only when the table is closed.
+              This speeds up writes on keys a lot, but if you use this
+              feature, you should add automatic checking of all
               <literal>MyISAM</literal> tables by starting the server
               with the <option>--myisam-recover</option> option (for
               example, <option>--myisam-recover=BACKUP,FORCE</option>).
@@ -3190,9 +3007,9 @@
 
             <para>
               Note that enabling external locking with
-              <option>--external-locking</option> doesn't offer any
-              protection against index corruption for tables that use
-              delayed key writes.
+              <option>--external-locking</option> offers no protection
+              against index corruption for tables that use delayed key
+              writes.
             </para>
           </listitem>
 
@@ -3217,8 +3034,8 @@
             </para>
 
             <para>
-              How long an <literal>INSERT DELAYED</literal> handler
-              thread should wait for <literal>INSERT</literal>
+              How many seconds an <literal>INSERT DELAYED</literal>
+              handler thread should wait for <literal>INSERT</literal>
               statements before terminating.
             </para>
           </listitem>
@@ -3288,15 +3105,16 @@
               This variable applies to NDB. By default it is 0
               (<literal>OFF</literal>): If you execute a query such as
               <literal>SELECT * FROM t WHERE mycol = 42</literal>, where
-              <literal>mycol</literal> is an non-indexed column, the
+              <literal>mycol</literal> is a non-indexed column, the
               query is executed as a full table scan on every NDB node.
               Each node sends every row to the MySQL server, which
               applies the <literal>WHERE</literal> condition. If
               <literal>engine_condition_pushdown</literal> is set to 1
               (<literal>ON</literal>), the condition is <quote>pushed
               down</quote> to the storage engine and sent to the NDB
-              nodes. Each node performs the scan, and only sends back to
-              the MySQL server the rows that match the condition.
+              nodes. Each node uses the condition to perform the scan,
+              and only sends back to the MySQL server the rows that
+              match the condition.
             </para>
           </listitem>
 
@@ -8278,10 +8096,11 @@
               quote character (like the
               &lsquo;<literal>`</literal>&rsquo; quote character) and
               not as a string quote character. You can still use
-              &lsquo;<literal>`</literal>&rsquo; to quote identifiers in
-              ANSI mode. With <literal>ANSI_QUOTES</literal> enabled,
-              you cannot use double quotes to quote a literal string,
-              because it is interpreted as an identifier.
+              &lsquo;<literal>`</literal>&rsquo; to quote identifiers
+              with this mode enabled. With
+              <literal>ANSI_QUOTES</literal> enabled, you cannot use
+              double quotes to quote a literal string, because it is
+              interpreted as an identifier.
             </para>
           </listitem>
 
@@ -8299,7 +8118,7 @@
               we encounter a division by zero (or
               <literal>MOD(X,0)</literal>) during an
               <literal>INSERT</literal> or <literal>UPDATE</literal>. If
-              this mode is not given, MySQL instead returns
+              this mode is not enabled, MySQL instead returns
               <literal>NULL</literal> for divisions by zero. If used in
               <literal>INSERT IGNORE</literal> or <literal>UPDATE
               IGNORE</literal>, MySQL generates a warning for divisions
@@ -8467,8 +8286,10 @@
             </para>
 
             <para>
-              Prevents automatic substitution of storage engine when the
-              requested storage engine is disabled or not compiled in.
+              Prevents automatic substitution of the default storage
+              engine when a statement such as <literal>CREATE
+              TABLE</literal> specifies a storage engine that is
+              disabled or not compiled in.
             </para>
           </listitem>
 
@@ -8533,8 +8354,8 @@
             <para>
               In subtraction operations, don't mark the result as
               <literal>UNSIGNED</literal> if one of the operands is
-              unsigned. Note that this makes <literal>UNSIGNED
-              BIGINT</literal> not 100% usable in all contexts. See
+              unsigned. Note that this makes <literal>BIGINT
+              UNSIGNED</literal> not 100% usable in all contexts. See
               <xref linkend="cast-functions"/>.
             </para>
           </listitem>
@@ -8569,9 +8390,9 @@
             <para>
               In strict mode, don't accept dates where the month or day
               part is 0. If used with the <literal>IGNORE</literal>
-              option, we insert a <literal>'0000-00-00'</literal> date
-              for any such date. When not in strict mode, the date is
-              accepted but a warning is generated.
+              option, MySQL inserts a <literal>'0000-00-00'</literal>
+              date for any such date. When not in strict mode, the date
+              is accepted but a warning is generated.
             </para>
           </listitem>
 
@@ -8585,8 +8406,9 @@
             </para>
 
             <para>
-              Do not allow queries that in the <literal>GROUP
-              BY</literal> part refer to a column that is not selected.
+              Do not allow queries for which the <literal>GROUP
+              BY</literal> clause refers to a column that is not present
+              in the output column list.
             </para>
           </listitem>
 
@@ -8617,7 +8439,8 @@
 
             <para>
               Treat <literal>REAL</literal> as a synonym for
-              <literal>FLOAT</literal> rather than as a synonym for
+              <literal>FLOAT</literal>. By default, MySQL treats
+              <literal>REAL</literal> as a synonym for
               <literal>DOUBLE</literal>.
             </para>
           </listitem>
@@ -8714,7 +8537,7 @@
         <para>
           Strict mode disallows invalid date values such as
           <literal>'2004-04-31'</literal>. It does not disallow dates
-          with zero parts such as <literal>2004-04-00'</literal> or
+          with zero parts such as <literal>'2004-04-00'</literal> or
           <quote>zero</quote> dates. To disallow these as well, enable
           the <literal>NO_ZERO_IN_DATE</literal> and
           <literal>NO_ZERO_DATE</literal> SQL modes in addition to

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