List:Internals« Previous MessageNext Message »
From:jon Date:August 5 2005 11:39am
Subject:bk commit - mysqldoc@docsrva tree (jon:1.3175)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of jon. When jon does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3175 05/08/05 19:39:03 jon@stripped +3 -0
  More edits for RefMan-4.1 Administration 
  chapter.
  
  RefMan & RefMan-5.0: Use USER() to get hostname.

  refman/mysql-database-administration.xml
    1.39 05/08/05 19:39:01 jon@stripped +25 -12
    No reason not to use USER() for this...

  refman-5.0/mysql-database-administration.xml
    1.40 05/08/05 19:39:01 jon@stripped +16 -11
    No reason not to use USER() for this...

  refman-4.1/mysql-database-administration.xml
    1.29 05/08/05 19:39:01 jon@stripped +366 -1035
    More edits for 4.1 version.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jon
# Host:	gigan.
# Root:	/home/jon/bk/mysqldoc

--- 1.28/refman-4.1/mysql-database-administration.xml	2005-08-05 13:19:14 +10:00
+++ 1.29/refman-4.1/mysql-database-administration.xml	2005-08-05 19:39:01 +10:00
@@ -6095,42 +6095,6 @@
 
         <listitem>
           <para>
-            <literal>optimizer_prune_level</literal>
-          </para>
-
-          <para>
-            Controls the heuristics applied during query optimization to
-            prune less-promising partial plans from the optimizer search
-            space. A value of 0 disables heuristics so that the
-            optimizer performs an exhaustive search. A value of 1 causes
-            the optimizer to prune plans based on the number of rows
-            retrieved by intermediate plans. This variable was added in
-            MySQL 5.0.1.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>optimizer_search_depth</literal>
-          </para>
-
-          <para>
-            The maximum depth of search performed by the query
-            optimizer. Values larger than the number of relations in a
-            query result in better query plans, but take longer to
-            generate an execution plan for a query. Values smaller than
-            the number of relations in a query return an execution plan
-            quicker, but the resulting plan may be far from being
-            optimal. If set to 0, the system automatically picks a
-            reasonable value. If set to the maximum number of tables
-            used in a query plus 2, the optimizer switches to the
-            original algorithm used before MySQL 5.0.1 that performs an
-            exhaustive search. This variable was added in MySQL 5.0.1.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             <literal>pid_file</literal>
           </para>
 
@@ -6195,7 +6159,7 @@
           </para>
 
           <para>
-            do not cache results that are bigger than this. The default
+            Do not cache results that are bigger than this. The default
             value is 1MB. This variable was added in MySQL 4.0.1.
           </para>
         </listitem>
@@ -6221,10 +6185,11 @@
 
           <para>
             The amount of memory allocated for caching query results.
-            The default value is 0, which disables the query cache. Note
-            that this amount of memory is allocated even if
-            <literal>query_cache_type</literal> is set to 0. This
-            variable was added in MySQL 4.0.1.
+            The default value is <literal>0</literal>, which disables 
+            the query cache. Note that this amount of memory is 
+            allocated even if <literal>query_cache_type</literal> is set 
+            to <literal>0</literal>. This variable was added in MySQL 
+            4.0.1.
           </para>
         </listitem>
 
@@ -6250,20 +6215,26 @@
                   <entry><emphasis
role="bold">Description</emphasis></entry>
                 </row>
                 <row>
-                  <entry><literal>0</literal> or
<literal>OFF</literal></entry>
-                  <entry>do not cache or retrieve results. Note that this does not
deallocate the
-                    query cache buffer. To do that, you should set
-                    <literal>query_cache_size</literal> to 0.</entry>
+                  <entry><literal>0</literal> or 
+                    <literal>OFF</literal></entry>
+                  <entry>do not cache or retrieve results. Note that 
+                    this does not deallocate the query cache buffer. To 
+                    do that, you should set 
+                    <literal>query_cache_size</literal> to 
+                    <literal>0</literal>.</entry>
                 </row>
                 <row>
-                  <entry><literal>1</literal> or
<literal>ON</literal></entry>
-                  <entry>Cache all query results except for those that begin with
<literal>SELECT
-                    SQL_NO_CACHE</literal>.</entry>
+                  <entry><literal>1</literal> or 
+                    <literal>ON</literal></entry>
+                  <entry>Cache all query results except for those that 
+                    begin with <literal>SELECT 
+                      SQL_NO_CACHE</literal>.</entry>
                 </row>
                 <row>
-                  <entry><literal>2</literal> or
<literal>DEMAND</literal></entry>
-                  <entry>Cache results only for queries that begin with
<literal>SELECT
-                    SQL_CACHE</literal>.</entry>
+                  <entry><literal>2</literal> or 
+                    <literal>DEMAND</literal></entry>
+                  <entry>Cache results only for queries that begin with 
+                    <literal>SELECT SQL_CACHE</literal>.</entry>
                 </row>
               </tbody>
             </tgroup>
@@ -6306,17 +6277,13 @@
             helpful in improving performance, because it can reduce the
             need for the server to perform memory allocation during
             query execution operations.
-
-<!--  It will not necessarily eliminate allocation completely; server *may* still
-->
-          </para>
-
-          <para>
-<!--  allocate memory in some situations, e.g., transaction-related or sp-related
-->
           </para>
 
-          <para>
-<!--  ops. -->
-          </para>
+<!--  
+      It will not necessarily eliminate allocation completely; server 
+      *may* still allocate memory in some situations, e.g., 
+      transaction-related or sp-related ops. 
+-->
 
           <para>
             This variable was added in MySQL 4.0.16.
@@ -6370,8 +6337,9 @@
 
           <para>
             Disables or enables automatic purging of relay logs as soon
-            as they are not needed any more. The default value is 1
-            (enabled). This variable was added in MySQL 4.1.1.
+            as they are not needed any more. The default value is 
+            <literal>1</literal> (enabled). This variable was added in 
+            MySQL 4.1.1.
           </para>
         </listitem>
 
@@ -6384,12 +6352,12 @@
             When reading rows in sorted order after a sort, the rows are
             read through this buffer to avoid disk seeks. Setting the
             variable to a large value can improve <literal>ORDER
-            BY</literal> performance by a lot. However, this is a buffer
-            allocated for each client, so you should not set the global
-            variable to a large value. Instead, change the session
-            variable only from within those clients that need to run
-            large queries. This variable was added in MySQL 4.0.3.
-            Previously, it was named
+            BY</literal> performance considerably. However, this is a 
+            buffer allocated for each client, so you should not set the 
+            global variable to a large value. Instead, change the 
+            session variable only from within those clients that need to 
+            run large queries. This variable was added in MySQL 4.0.3.
+            Previously, it was named 
             <literal>record_rnd_buffer</literal>.
           </para>
         </listitem>
@@ -6400,17 +6368,18 @@
           </para>
 
           <para>
-            do not show databases for which the user has no database or
-            table privileges. This can improve security if you're
+            Do not show databases for which the user has no database or
+            table privileges. This can improve security if you are
             concerned about people being able to see what databases
             other users have. See also
             <literal>skip_show_database</literal>.
           </para>
 
           <para>
-            This variable was removed in MySQL 4.0.5. Instead, use the
-            <literal>SHOW DATABASES</literal> privilege to control
-            access by MySQL accounts to database names.
+            This variable was removed in MySQL 4.0.5. Beginning with 
+            this version, you should instead use the <literal>SHOW 
+            DATABASES</literal> privilege to control access by MySQL 
+            accounts to databases.
           </para>
         </listitem>
 
@@ -6430,7 +6399,7 @@
 
           <para>
             You should enable this option if you want to prevent all
-            usage of passwords in old format (and hence insecure
+            usage of passwords in the old format (and hence insecure
             communication over the network). This variable was added in
             MySQL 4.1.1.
           </para>
@@ -6439,10 +6408,8 @@
             Server startup fails with an error if this option is enabled
             and the privilege tables are in pre-4.1 format.
           </para>
-
-          <para>
+          
 <!--  TODO: this does not really belong here in a discussion of server variables
-->
-          </para>
 
           <para>
             When used as a client-side option, the client refuses to
@@ -6527,7 +6494,7 @@
             This prevents people from using the <literal>SHOW
             DATABASES</literal> statement if they do not have the
             <literal>SHOW DATABASES</literal> privilege. This can
-            improve security if you're concerned about people being able
+            improve security if you are concerned about people being able
             to see what databases other users have. See also
             <literal>safe_show_database</literal>. This variable was
             added in MySQL 3.23.4. As of MySQL 4.0.2, its effect also
@@ -6550,7 +6517,7 @@
           </para>
 
           <para>
-            Whether to use compression of the slave/master protocol if
+            Whether to use compression of the master/slave protocol if
             both the slave and the master support it. This variable was
             added in MySQL 4.0.3.
           </para>
@@ -6599,16 +6566,17 @@
           <para>
             If a replication slave SQL thread fails to execute a
             transaction because of an <literal>InnoDB</literal> deadlock
-            or exceeded InnoDB's
-            <literal>innodb_lock_wait_timeout</literal> or NDBCluster's
+            or <literal>InnoDB</literal>'s 
+            <literal>innodb_lock_wait_timeout</literal> or 
+            <literal>NDB Cluster</literal>'s
             <literal>TransactionDeadlockDetectionTimeout</literal> or
-            <literal>TransactionInactiveTimeout</literal>, it
-            automatically retries
+            <literal>TransactionInactiveTimeout</literal> was exceeded, 
+            it automatically retries
             <literal>slave_transaction_retries</literal> times before
-            stopping with an error. The default in MySQL 4.1 is 0. You
-            must explicitly set the value greater than 0 to enable the
-            <quote>retry</quote> behavior, which is probably a good
-            idea.
+            stopping with an error. The default in MySQL 4.1 is 
+            <literal>0</literal>. You must explicitly set the value to 
+            greater than 0 to enable the <quote>retry</quote> behavior, 
+            which is probably a good idea.
           </para>
         </listitem>
 
@@ -6712,10 +6680,11 @@
           <para>
             This was added as a command-line option in MySQL 4.0.18, and
             is also a settable global variable since MySQL 4.1.3. If set
-            to 1, when a non-temporary table is created it synchronizes
-            its <filename>.frm</filename> file to disk
-            (<literal>fdatasync()</literal>); this is slower but safer
-            in case of crash. Default is 1.
+            to <literal>1</literal>, when a non-temporary table is 
+            created it synchronizes its <filename>.frm</filename> file 
+            to disk (<literal>fdatasync()</literal>); this is slower but 
+            safer in case of a crash. The default is 
+            <literal>1</literal>.
           </para>
         </listitem>
 
@@ -6752,7 +6721,7 @@
             <literal>Opened_tables</literal> status variable. See
             <xref linkend="server-status-variables"/>. If the value of
             <literal>Opened_tables</literal> is large and you do not do
-            <literal>FLUSH TABLES</literal> a lot (which just forces all
+            <literal>FLUSH TABLES</literal> often (which just forces all
             tables to be closed and reopened), then you should increase
             the value of the <literal>table_cache</literal> variable.
           </para>
@@ -6827,19 +6796,14 @@
             this value. The default is large enough for normal
             operation. See <xref linkend="mysql-benchmarks"/>.
           </para>
-
-          <para>
-<!--  TODO: uncomment when implemented -->
-          </para>
-
-          <para>
-<!--  @item time_format -->
-          </para>
-
-          <para>
-<!--  ADD DESCRIPTION -->
-          </para>
         </listitem>
+        
+<!--  
+      TODO: Uncomment when implemented:
+      
+      @item time_format
+      [ADD DESCRIPTION]
+-->
 
         <listitem>
           <para>
@@ -6962,51 +6926,6 @@
 
         <listitem>
           <para>
-            <literal>updatable_views_with_limit</literal>
-          </para>
-
-          <para>
-            This variable controls whether updates can be made using a
-            view that does not contain a primary key in the underlying
-            table, if the update contains a <literal>LIMIT</literal>
-            clause. (Such updates often are generated by GUI tools.) An
-            update is an <literal>UPDATE</literal> or
-            <literal>DELETE</literal> statement. Primary key here means
-            a <literal>PRIMARY KEY</literal>, or a
-            <literal>UNIQUE</literal> index in which no column can
-            contain <literal>NULL</literal>.
-          </para>
-
-          <para>
-            The variable can have two values:
-          </para>
-
-          <itemizedlist>
-
-            <listitem>
-              <para>
-                <literal>1</literal> or <literal>YES</literal>:
Issue a
-                warning only (not an error message). This is the default
-                value.
-              </para>
-            </listitem>
-
-            <listitem>
-              <para>
-                <literal>0</literal> or <literal>NO</literal>:
Prohibit
-                the update.
-              </para>
-            </listitem>
-
-          </itemizedlist>
-
-          <para>
-            This variable was added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             <literal>version</literal>
           </para>
 
@@ -7114,8 +7033,10 @@
             <colspec colwidth="30*"/>
             <tbody>
               <row>
-                <entry><emphasis role="bold">Variable
Name</emphasis></entry>
-                <entry><emphasis role="bold">Value
Type</emphasis></entry>
+                <entry><emphasis role="bold">Variable 
+                    Name</emphasis></entry>
+                <entry><emphasis role="bold">Value 
+                    Type</emphasis></entry>
                 <entry><emphasis
role="bold">Type</emphasis></entry>
               </row>
               <row>
@@ -7136,45 +7057,52 @@
               <row>
                
<entry><literal>bulk_insert_buffer_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>character_set_client</literal></entry>
                 <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>character_set_connection</literal></entry>
                 <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
 
 <!--  do not advertise this variable as being dynamic... -->
 
-<!--  @item @code{character_set_database} @tab string @tab @code{GLOBAL} |
@code{SESSION} --></entry>
+<!--  @item @code{character_set_database} @tab string @tab @code{GLOBAL} |
@code{SESSION} -->
               </row>
               <row>
                
<entry><literal>character_set_results</literal></entry>
                 <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>character_set_server</literal></entry>
                 <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>collation_connection</literal></entry>
                 <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
 
 <!--  do not advertise this variable as being dynamic... -->
 
-<!--  @item @code{collation_database} @tab string @tab @code{GLOBAL} | @code{SESSION}
--></entry>
+<!--  @item @code{collation_database} @tab string @tab @code{GLOBAL} | @code{SESSION}
-->
               </row>
               <row>
                
<entry><literal>collation_server</literal></entry>
                 <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>concurrent_insert</literal></entry>
@@ -7189,7 +7117,8 @@
               <row>
                
<entry><literal>convert_character_set</literal></entry>
                 <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
 
 <!--  next one not listed in system variable section yet -->
 
@@ -7197,16 +7126,18 @@
 
 <!--  next one not listed in system variable section yet -->
 
-<!--  @item @code{datetime_format} @tab string @tab @code{GLOBAL} | @code{SESSION}
--></entry>
+<!--  @item @code{datetime_format} @tab string @tab @code{GLOBAL} | @code{SESSION}
-->
               </row>
               <row>
                
<entry><literal>default_week_format</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>delay_key_write</literal></entry>
-                <entry><literal>OFF</literal> |
<literal>ON</literal> | <literal>ALL</literal></entry>
+                <entry><literal>OFF</literal> |
<literal>ON</literal> | 
+                  <literal>ALL</literal></entry>
                 <entry><literal>GLOBAL</literal></entry>
               </row>
               <row>
@@ -7257,17 +7188,19 @@
               <row>
                
<entry><literal>group_concat_max_len</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>identity</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>SESSION</literal>
+                <entry><literal>SESSION</literal></entry>
+              </row>
 
 <!--  innodb_autoextend_increment: introduced in 4.1.5, made settable in 4.1.6 -->
 
-<!--  innodb_autoextend_increment: backported to 4.0.24 --></entry>
-              </row>
+<!--  innodb_autoextend_increment: backported to 4.0.24 -->
+
               <row>
                
<entry><literal>innodb_autoextend_increment</literal></entry>
                 <entry>numeric</entry>
@@ -7296,7 +7229,8 @@
               <row>
                
<entry><literal>innodb_table_locks</literal></entry>
                 <entry>boolean</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>innodb_thread_concurrency</literal></entry>
@@ -7314,20 +7248,23 @@
               <row>
                
<entry><literal>interactive_timeout</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>join_buffer_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>key_buffer_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal>
-
-<!--  TODO: missing key_cache_xxx variables? --></entry>
+                <entry><literal>GLOBAL</literal></entry>
               </row>
+
+<!--  TODO: missing key_cache_xxx variables? -->
+
               <row>
                 <entry><literal>last_insert_id</literal></entry>
                 <entry>numeric</entry>
@@ -7346,17 +7283,20 @@
               <row>
                 <entry><literal>long_query_time</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>low_priority_updates</literal></entry>
                 <entry>boolean</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>max_allowed_packet</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>max_binlog_cache_size</literal></entry>
@@ -7386,12 +7326,14 @@
               <row>
                 <entry><literal>max_error_count</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>max_heap_table_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>max_insert_delayed_threads</literal></entry>
@@ -7401,7 +7343,8 @@
               <row>
                 <entry><literal>max_join_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>max_relay_log_size</literal></entry>
@@ -7411,17 +7354,20 @@
               <row>
                
<entry><literal>max_seeks_for_key</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>max_sort_length</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>max_tmp_tables</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>max_user_connections</literal></entry>
@@ -7436,7 +7382,8 @@
               <row>
                
<entry><literal>multi_read_range</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>myisam_data_pointer_size</literal></entry>
@@ -7451,57 +7398,68 @@
               <row>
                
<entry><literal>myisam_repair_threads</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>myisam_sort_buffer_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>net_buffer_length</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>net_read_timeout</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>net_retry_count</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>net_write_timeout</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>old_passwords</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>optimizer_prune_level</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>optimizer_search_depth</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>preload_buffer_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>query_alloc_block_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>query_cache_limit</literal></entry>
@@ -7516,27 +7474,32 @@
               <row>
                
<entry><literal>query_cache_type</literal></entry>
                 <entry>enumeration</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>query_cache_wlock_invalidate</literal></entry>
                 <entry>boolean</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>query_prealloc_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>range_alloc_block_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>read_buffer_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>read_only</literal></entry>
@@ -7546,7 +7509,8 @@
               <row>
                
<entry><literal>read_rnd_buffer_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>rpl_recovery_rank</literal></entry>
@@ -7591,7 +7555,8 @@
               <row>
                
<entry><literal>sort_buffer_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>sql_auto_is_null</literal></entry>
@@ -7631,17 +7596,20 @@
               <row>
                
<entry><literal>sql_low_priority_updates</literal></entry>
                 <entry>boolean</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>sql_max_join_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>sql_mode</literal></entry>
                 <entry>enumeration</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>sql_notes</literal></entry>
@@ -7671,7 +7639,8 @@
               <row>
                
<entry><literal>updatable_views_with_limit</literal></entry>
                 <entry>enumeration</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>sql_warnings</literal></entry>
@@ -7691,7 +7660,8 @@
               <row>
                 <entry><literal>storage_engine</literal></entry>
                 <entry>enumeration</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>table_cache</literal></entry>
@@ -7701,21 +7671,23 @@
               <row>
                 <entry><literal>table_type</literal></entry>
                 <entry>enumeration</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>thread_cache_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal>
+                <entry><literal>GLOBAL</literal></entry>
+              </row>
 
 <!--  next one not listed in system variable section yet -->
 
-<!--  @item @code{time_format} @tab string @tab @code{GLOBAL} | @code{SESSION}
--></entry>
-              </row>
+<!--  @item @code{time_format} @tab string @tab @code{GLOBAL} | @code{SESSION} -->
               <row>
                 <entry><literal>time_zone</literal></entry>
                 <entry>string</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>timestamp</literal></entry>
@@ -7725,22 +7697,26 @@
               <row>
                 <entry><literal>tmp_table_size</literal></entry>
                 <entry>enumeration</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>transaction_alloc_block_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                
<entry><literal>transaction_prealloc_size</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>tx_isolation</literal></entry>
                 <entry>enumeration</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>unique_checks</literal></entry>
@@ -7750,7 +7726,8 @@
               <row>
                 <entry><literal>wait_timeout</literal></entry>
                 <entry>numeric</entry>
-                <entry><literal>GLOBAL</literal> |
<literal>SESSION</literal></entry>
+                <entry><literal>GLOBAL</literal> | 
+                  <literal>SESSION</literal></entry>
               </row>
               <row>
                 <entry><literal>warning_count</literal></entry>
@@ -7765,7 +7742,8 @@
           Variables that are marked as <quote>string</quote> take a
           string value. Variables that are marked as
           <quote>numeric</quote> take a numeric value. Variables that
-          are marked as <quote>boolean</quote> can be set to 0, 1,
+          are marked as <quote>boolean</quote> can be set to 
+          <literal>0</literal>, <literal>1</literal>,
           <literal>ON</literal> or <literal>OFF</literal>.
Variables
           that are marked as <quote>enumeration</quote> normally should
           be set to one of the available values for the variable, but
@@ -7922,8 +7900,7 @@
           <para>
             New
            
<literal>Com_stmt_<replaceable>xxx</replaceable></literal>
-            status variables have been added in MySQL 4.1.13 or 5.0.8,
-            respectively.
+            status variables have been added in MySQL 4.1.13.
 
             <itemizedlist>
 
@@ -7941,13 +7918,6 @@
 
               <listitem>
                 <para>
-                  <literal>Com_stmt_fetch</literal> (not available in
-                  versions before 5.0)
-                </para>
-              </listitem>
-
-              <listitem>
-                <para>
                   <literal>Com_stmt_send_long_data</literal>
                 </para>
               </listitem>
@@ -7979,6 +7949,7 @@
             one issues the following SQL statements:
             <literal>PREPARE</literal>,
<literal>EXECUTE</literal>, or
             <literal>DEALLOCATE</literal> respectively.
+          </para>
 
 <!--
       Additionally, the values of the older (available since MySQL 4.1.3)
@@ -7987,12 +7958,7 @@
       <literal>Com_deallocate_sql</literal> are increased for
       the <literal>PREPARE</literal>, <literal>EXECUTE</literal>,
and
       <literal>DEALLOCATE</literal> statements.
-      -->
-
-            <literal>Com_stmt_fetch</literal> stands for the total
-            number of network round-trips issued when fetching from
-            cursors.
-          </para>
+-->
 
           <para>
             All of the
@@ -8119,8 +8085,8 @@
             storage engine if it knows about a table with a given name.
             This is called discovery.
             <literal>Handler_discover</literal> indicates the number of
-            time tables have been discovered. This variable was added in
-            MySQL 4.1.2.
+            times that tables have been discovered. This variable was 
+            added in MySQL 4.1.2.
           </para>
         </listitem>
 
@@ -8243,478 +8209,7 @@
             The number of requests to insert a row in a table.
           </para>
         </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_pages_data</literal>
-          </para>
-
-          <para>
-            The number of pages containing data (dirty or clean). Added
-            in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_pages_dirty</literal>
-          </para>
-
-          <para>
-            The number of pages currently dirty. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_pages_flushed</literal>
-          </para>
-
-          <para>
-            The number of buffer pool pages that have been requested to
-            be flushed. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_pages_free</literal>
-          </para>
-
-          <para>
-            The number of free pages. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_pages_latched</literal>
-          </para>
-
-          <para>
-            The number of latched pages in <literal>InnoDB</literal>
-            buffer pool. These are pages currently being read or written
-            or that cannot be flushed or removed for some other reason.
-            Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_pages_misc</literal>
-          </para>
-
-          <para>
-            The number of pages busy because they have been allocated
-            for administrative overhead such as row locks or the
-            adaptive hash index. This value can also be calculated as
-            <literal>Innodb_buffer_pool_pages_total</literal> -
-            <literal>Innodb_buffer_pool_pages_free</literal> -
-            <literal>Innodb_buffer_pool_pages_data</literal>. Added in
-            MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_pages_total</literal>
-          </para>
-
-          <para>
-            Total size of buffer pool, in pages. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_read_ahead_rnd</literal>
-          </para>
-
-          <para>
-            The number of <quote>random</quote> read-aheads
-            <literal>InnoDB</literal> initiated. This happens when a
-            query is to scan a large portion of a table but in random
-            order. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_read_ahead_seq</literal>
-          </para>
-
-          <para>
-            The number of sequential read-aheads
-            <literal>InnoDB</literal> initiated. This happens when
-            <literal>InnoDB</literal> does a sequential full table scan.
-            Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_read_requests</literal>
-          </para>
-
-          <para>
-            The number of logical read requests
-            <literal>InnoDB</literal> has done. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_reads</literal>
-          </para>
-
-          <para>
-            The number of logical reads that <literal>InnoDB</literal>
-            could not satisfy from buffer pool and had to do a
-            single-page read. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_wait_free</literal>
-          </para>
-
-          <para>
-            Normally, writes to the <literal>InnoDB</literal> buffer
-            pool happen in the background. However, if it's necessary to
-            read or create a page and no clean pages are available, it's
-            necessary to wait for pages to be flushed first. This
-            counter counts instances of these waits. If the buffer pool
-            size was set properly, this value should be small. Added in
-            MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_buffer_pool_write_requests</literal>
-          </para>
-
-          <para>
-            The number writes done to the <literal>InnoDB</literal>
-            buffer pool. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_data_fsyncs</literal>
-          </para>
-
-          <para>
-            The number of <literal>fsync()</literal> operations so far.
-            Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_data_pending_fsyncs</literal>
-          </para>
-
-          <para>
-            The current number of pending <literal>fsync()</literal>
-            operations. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_data_pending_reads</literal>
-          </para>
-
-          <para>
-            The current number of pending reads. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_data_pending_writes</literal>
-          </para>
-
-          <para>
-            The current number of pending writes. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_data_read</literal>
-          </para>
-
-          <para>
-            The amount of data read so far, in bytes. Added in MySQL
-            5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_data_reads</literal>
-          </para>
-
-          <para>
-            The total number of data reads. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_data_writes</literal>
-          </para>
-
-          <para>
-            The total number of data writes. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_data_written</literal>
-          </para>
-
-          <para>
-            The amount of data written so far, in bytes. Added in MySQL
-            5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_dblwr_writes</literal> ,
-            <literal>Innodb_dblwr_pages_written</literal>
-          </para>
-
-          <para>
-            The number of doublewrite writes that have been performed
-            and the number of pages that have been written for this
-            purpose. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_log_waits</literal>
-          </para>
-
-          <para>
-            The number of waits we had because log buffer was too small
-            and we had to wait for it to be flushed before continuing.
-            Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_log_write_requests</literal>
-          </para>
-
-          <para>
-            The number of log write requests. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_log_writes</literal>
-          </para>
-
-          <para>
-            The number of physical writes to the log file. Added in
-            MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_os_log_fsyncs</literal>
-          </para>
-
-          <para>
-            The number of fsyncs writes done to the log file. Added in
-            MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_os_log_pending_fsyncs</literal>
-          </para>
-
-          <para>
-            The number of pending log file fsyncs. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_os_log_pending_writes</literal>
-          </para>
-
-          <para>
-            Pending log file writes. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_os_log_written</literal>
-          </para>
-
-          <para>
-            The number of bytes written to the log file. Added in MySQL
-            5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_page_size</literal>
-          </para>
-
-          <para>
-            The compiled-in <literal>InnoDB</literal> page size (default
-            16KB). Many values are counted in pages; the page size
-            allows them to be easily converted to bytes. Added in MySQL
-            5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_pages_created</literal>
-          </para>
-
-          <para>
-            The number of pages created. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_pages_read</literal>
-          </para>
-
-          <para>
-            The number of pages read. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_pages_written</literal>
-          </para>
-
-          <para>
-            The number of pages written. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_row_lock_current_waits</literal>
-          </para>
-
-          <para>
-            The number of row locks currently being waited for. Added in
-            MySQL 5.0.3.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_row_lock_time</literal>
-          </para>
-
-          <para>
-            The total time spent in acquiring row locks, in
-            milliseconds. Added in MySQL 5.0.3.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_row_lock_time_avg</literal>
-          </para>
-
-          <para>
-            The average time to acquire a row lock, in milliseconds.
-            Added in MySQL 5.0.3.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_row_lock_time_max</literal>
-          </para>
-
-          <para>
-            The maximum time to acquire a row lock, in milliseconds.
-            Added in MySQL 5.0.3.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_row_lock_waits</literal>
-          </para>
-
-          <para>
-            The number of times a row lock had to be waited for. Added
-            in MySQL 5.0.3.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_rows_deleted</literal>
-          </para>
-
-          <para>
-            The number of rows deleted from <literal>InnoDB</literal>
-            tables. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_rows_inserted</literal>
-          </para>
-
-          <para>
-            The number of rows inserted in <literal>InnoDB</literal>
-            tables. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_rows_read</literal>
-          </para>
-
-          <para>
-            The number of rows read from <literal>InnoDB</literal>
-            tables. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
-            <literal>Innodb_rows_updated</literal>
-          </para>
-
-          <para>
-            The number of rows updated in <literal>InnoDB</literal>
-            tables. Added in MySQL 5.0.2.
-          </para>
-        </listitem>
-
+        
         <listitem>
           <para>
             <literal>Key_blocks_not_flushed</literal>
@@ -8798,24 +8293,7 @@
             The number of physical writes of a key block to disk.
           </para>
         </listitem>
-
-        <listitem>
-          <para>
-            <literal>Last_query_cost</literal>
-          </para>
-
-          <para>
-            The total cost of the last compiled query as computed by the
-            query optimizer. Useful for comparing the cost of different
-            query plans for the same query. The default value of 0 means
-            that no query has been compiled yet. This variable was added
-            in MySQL 5.0.1, with a default value of -1. In MySQL 5.0.7,
-            the default was changed to 0; also in version 5.0.7, the
-            scope of <literal>Last_query_cost</literal> was changed to
-            session rather than a global.
-          </para>
-        </listitem>
-
+        
         <listitem>
           <para>
             <literal>Max_used_connections</literal>
@@ -9037,9 +8515,10 @@
 
           <para>
             The number of joins without keys that check for key usage
-            after each row. (If this is not 0, you should carefully
-            check the indexes of your tables.) This variable was added
-            in MySQL 3.23.25.
+            after each row. (If this is not equal to 
+            <literal>0</literal>, you should very carefully check the 
+            indexes of your tables.) This variable was added in MySQL 
+            3.23.25.
           </para>
         </listitem>
 
@@ -9085,7 +8564,7 @@
           <para>
             Total (since startup) number of times the replication slave
             SQL thread has retried transactions. This variable was added
-            in MySQL 4.1.11 and 5.0.4.
+            in MySQL 4.1.11.
           </para>
         </listitem>
 
@@ -9157,11 +8636,9 @@
             The number of sorts that were done by scanning the table.
             This variable was added in MySQL 3.23.25.
           </para>
-
-          <para>
-<!--  TODO: add SSL status variables -->
-          </para>
         </listitem>
+        
+<!--  TODO: add SSL status variables -->
 
         <listitem>
           <para>
@@ -9181,7 +8658,7 @@
 
           <para>
             The number of times that a table lock was acquired
-            immediately. This variable was added as of MySQL 3.23.33.
+            immediately. This variable was added in MySQL 3.23.33.
           </para>
         </listitem>
 
@@ -9195,7 +8672,7 @@
             immediately and a wait was needed. If this is high, and you
             have performance problems, you should first optimize your
             queries, and then either split your table or tables or use
-            replication. This variable was added as of MySQL 3.23.33.
+            replication. This variable was added in MySQL 3.23.33.
           </para>
         </listitem>
 
@@ -9230,8 +8707,9 @@
             <literal>Threads_created</literal> is big, you may want to
             increase the <literal>thread_cache_size</literal> value. The
             cache hit rate can be calculated as
-           
<literal>Threads_created</literal>/<literal>Connections</literal>.
-            This variable was added in MySQL 3.23.31.
+            <literal>Threads_created</literal> divided by 
+            <literal>Connections</literal>. This variable was added in 
+            MySQL 3.23.31.
           </para>
         </listitem>
 
@@ -9273,37 +8751,37 @@
 
       <listitem>
         <para>
-          The shutdown process is initiated
+          The shutdown process is initiated.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          The server creates a shutdown thread if necessary
+          The server creates a shutdown thread if necessary.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          The server stops accepting new connections
+          The server stops accepting new connections.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          The server terminates current activity
+          The server terminates current activity.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          Storage engines are shut down or closed
+          Storage engines are shut down or closed.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          The server exits
+          The server exits.
         </para>
       </listitem>
 
@@ -9329,7 +8807,12 @@
           initiation methods are possible as well: The server shuts down
           on Unix when it receives a <literal>SIGTERM</literal> signal.
           A server running as a service on Windows shuts down when the
-          services manager tells it to.
+          services manager tells it to. (On Windows, a user with 
+          Administrator rights can also shut down the server using 
+          <literal>NET STOP
<replaceable>service_name</replaceable></literal>,
+          where <replaceable>service_name</replaceable> is the name of 
+          the MySQL service. By default, this is 
+          <literal>MySQL</literal>.)
         </para>
       </listitem>
 
@@ -9427,11 +8910,9 @@
         <para>
           Each storage engine performs any actions necessary for tables
           that it manages. For example, MyISAM flushes any pending index
-          writes for a table. InnoDB flushes its buffer pool to disk
-          (starting from 5.0.5: unless
-          <literal>innodb_fast_shutdown</literal> is 2), writes the
-          current LSN to the tablespace, and terminates its own internal
-          threads.
+          writes for a table. InnoDB flushes its buffer pool to disk, 
+          writes the current LSN to the tablespace, and terminates its 
+          own internal threads.
         </para>
       </listitem>
 
@@ -9504,10 +8985,9 @@
             <literal>mysql</literal> database!</emphasis> This is
             critical. <emphasis role="bold">The encrypted password is
             the real password in MySQL.</emphasis> Anyone who knows the
-            password that is listed in the <literal>user</literal> table
-            and has access to the host listed for the account
-            <emphasis role="bold">can easily log in as that
-            user</emphasis>.
+            password that is listed in the <literal>mysql.user</literal> 
+            table and who has access to the host listed for the account
+            <emphasis>can easily log in as that user</emphasis>.
           </para>
         </listitem>
 
@@ -9530,19 +9010,20 @@
               <para>
                 Try <literal>mysql -u root</literal>. If you are able to
                 connect successfully to the server without being asked
-                for a password, you have problems. Anyone can connect to
-                your MySQL server as the MySQL <literal>root</literal>
-                user with full privileges! Review the MySQL installation
-                instructions, paying particular attention to the
-                information about setting a <literal>root</literal>
-                password. See <xref linkend="default-privileges"/>.
+                for a password, then <emphasis>anyone</emphasis> can 
+                connect to your MySQL server as the MySQL 
+                <literal>root</literal> user with full privileges. 
+                Review the MySQL installation instructions, paying 
+                particular attention to the information about setting a 
+                <literal>root</literal> password. See 
+                <xref linkend="default-privileges"/>.
               </para>
             </listitem>
 
             <listitem>
               <para>
-                Use the <literal>SHOW GRANTS</literal> statement and
-                check to see who has access to what. Then use the
+                Use the <literal>SHOW GRANTS</literal> statement to see 
+                who has access to what. Then use the 
                 <literal>REVOKE</literal> statement to remove those
                 privileges that are not necessary.
               </para>
@@ -9568,10 +9049,10 @@
             <quote>xfish98</quote> are very bad. Much better is
             <quote>duag98</quote> which contains the same word
             <quote>fish</quote> but typed one key to the left on a
-            standard QWERTY keyboard. Another method is to use
-            <quote>Mhall</quote> which is taken from the first
-            characters of each word in the sentence <quote>Mary had a
-            little lamb.</quote> This is easy to remember and type, but
+            standard QWERTY keyboard. Another method is to use the first
+            characters of each word in a sentence. For example,
+            <quote>Mhall</quote> is taken from <quote>Mary had a little

+            lamb.</quote> This is easy to remember and type, but
             difficult to guess for someone who does not know it.
           </para>
         </listitem>
@@ -9609,9 +9090,9 @@
                 If you get a connection and some garbage characters, the
                 port is open, and should be closed on your firewall or
                 router, unless you really have a good reason to keep it
-                open. If <literal>telnet</literal> just hangs or the
-                connection is refused, everything is OK; the port is
-                blocked.
+                open. If <command>telnet</command> hangs or the 
+                connection is refused, this is good; this means that the 
+                port is blocked.
               </para>
             </listitem>
 
@@ -9642,10 +9123,10 @@
             OR 1=1</literal>. As a result, the server retrieves every
             record in the table. This exposes every record and causes
             excessive server load. The simplest way to protect from this
-            type of attack is to use apostrophes around the numeric
+            type of attack is to use single quotes around the numeric
             constants: <literal>SELECT * FROM table WHERE
             ID='234'</literal>. If the user enters extra information, it
-            all becomes part of the string. In numeric context, MySQL
+            all becomes part of the string. In a numeric context, MySQL
             automatically converts this string to a number and strips
             any trailing non-numeric characters from it.
           </para>
@@ -9805,7 +9286,8 @@
 
           <para>
             (This works under Linux and should work with small
-            modifications under other systems.) Warning: If you do not
+            modifications under other systems.) 
+            <emphasis role="bold">Warning</emphasis>: If you do not
             see plaintext data, this does not always mean that the
             information actually is encrypted. If you need high
             security, you should consult with a security expert.
@@ -9851,9 +9333,9 @@
         anyone who is able to watch the connection. If you are concerned
         about this, you can use the compressed protocol (in MySQL 3.22
         and above) to make traffic much more difficult to decipher. To
-        make the connection even more secure, you should use SSH to get
-        an encrypted TCP/IP connection between a MySQL server and a
-        MySQL client. You can find an Open Source SSH client at
+        make the connection even more secure, you should use SSH to 
+        obtain an encrypted TCP/IP connection between a MySQL server and 
+        a MySQL client. You can find an Open Source SSH client at
         <ulink url="http://www.openssh.org/"/>, and a commercial SSH
         client at <ulink url="http://www.ssh.com/"/>.
       </para>
@@ -9904,20 +9386,20 @@
 
         <listitem>
           <para>
-            do not run the MySQL server as the Unix
-            <literal>root</literal> user. This is very dangerous,
+            <emphasis>Do not run the MySQL server as the Unix
+            <literal>root</literal> user</emphasis>. This is very
dangerous,
             because any user with the <literal>FILE</literal> privilege
             is able to create files as <literal>root</literal> (for
             example, <literal>~root/.bashrc</literal>). To prevent this,
             <command>mysqld</command> refuses to run as
-            <literal>root</literal> unless that is specified explicitly
-            using a <option>--user=root</option> option.
+            <literal>root</literal> unless specified explicitly using 
+            the option <option>--user=root</option>.
           </para>
 
           <para>
-            <command>mysqld</command> can be run as an ordinary
-            unprivileged user instead. You can also create a separate
-            Unix account named <literal>mysql</literal> to make
+            <command>mysqld</command> can (and should) be run as an 
+            ordinary, unprivileged user instead. You can also create a 
+            separate Unix account named <literal>mysql</literal> to make
             everything even more secure. Use the account only for
             administering MySQL. To start <command>mysqld</command> as
             another Unix user, add a <literal>user</literal> option that
@@ -9944,18 +9426,19 @@
             Running <command>mysqld</command> as a Unix user other than
             <literal>root</literal> does not mean that you need to
             change the <literal>root</literal> username in the
-            <literal>user</literal> table. Usernames for MySQL accounts
-            have nothing to do with usernames for Unix accounts.
+            <literal>user</literal> table. <emphasis>Usernames for
MySQL 
+            accounts have nothing to do with usernames for Unix 
+            accounts</emphasis>.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            do not allow the use of symlinks to tables. (This can be
+            Do not allow the use of symlinks to tables. (This can be
             disabled with the <option>--skip-symbolic-links</option>
             option.) This is especially important if you run
             <command>mysqld</command> as <literal>root</literal>,
-            because anyone that has write access to the server's data
+            because anyone having write access to the server's data
             directory then could delete any file in the system! See
             <xref linkend="symbolic-links-to-tables"/>.
           </para>
@@ -9971,14 +9454,14 @@
 
         <listitem>
           <para>
-            do not grant the <literal>PROCESS</literal> or
+            Do not grant the <literal>PROCESS</literal> or
             <literal>SUPER</literal> privilege to non-administrative
             users. The output of <command>mysqladmin
             processlist</command> shows the text of the currently
             executing queries, so any user who is allowed to execute
-            that command might be able to see if another user issues an
-            <literal>UPDATE user SET
-            password=PASSWORD('not_secure')</literal> query.
+            that command might be able to see if another user issues a
+            query such as <literal>UPDATE user SET
+           
password=PASSWORD('<replaceable>plaintext-password</replaceable>');</literal>.
           </para>
 
           <para>
@@ -9999,10 +9482,10 @@
 
         <listitem>
           <para>
-            do not grant the <literal>FILE</literal> privilege to
+            Do not grant the <literal>FILE</literal> privilege to
             non-administrative users. Any user that has this privilege
             can write a file anywhere in the filesystem with the
-            privileges of the <command>mysqld</command> daemon! To make
+            privileges of the <command>mysqld</command> daemon. To make
             this a bit safer, files generated with <literal>SELECT ...
             INTO OUTFILE</literal> do not overwrite existing files and
             are writable by everyone.
@@ -10028,7 +9511,7 @@
             If you do not trust your DNS, you should use IP numbers
             rather than hostnames in the grant tables. In any case, you
             should be very careful about creating grant table entries
-            using hostname values that contain wildcards!
+            using hostname values that contain wildcards.
           </para>
         </listitem>
 
@@ -10047,14 +9530,15 @@
 
     </section>
 
+<!--  
+      TODO: There may be overlap between this and the section that has 
+      the general server option list... 
+-->
+
     <section id="privileges-options">
 
       <title
id='title-privileges-options'>&title-privileges-options;</title>
 
-<!--  TODO: There may be overlap between this and the section that has -->
-
-<!--  the general server option list... -->
-
       <para>
         The following <command>mysqld</command> options affect security:
       </para>
@@ -10069,12 +9553,12 @@
           <para>
             This option controls whether user-defined functions that
             have only an <literal>xxx</literal> symbol for the main
-            function can be loaded. By default, the option is off and
-            only UDFs that have at least one auxiliary symbol can be
+            function can be loaded. By default, the option is turned off 
+            and only UDFs that have at least one auxiliary symbol can be
             loaded. This prevents attempts at loading functions from
             shared object files other than those containing legitimate
-            UDFs. This option was added in MySQL 4.0.24, 4.1.10a, and
-            5.0.3. See <xref linkend="udf-security"/>.
+            UDFs. This option was added in MySQL 4.0.24 and 4.1.10a. See 
+            <xref linkend="udf-security"/>.
           </para>
         </listitem>
 
@@ -10166,9 +9650,9 @@
 
           <para>
             This option causes the server not to use the privilege
-            system at all. This gives everyone <emphasis>full
-            access</emphasis> to all databases! (You can tell a running
-            server to start using the grant tables again by executing a
+            system at all. <emphasis>This gives everyone full access to 
+            all databases</emphasis>. (You can tell a running server to 
+            start using the grant tables again by executing a
             <command>mysqladmin flush-privileges</command> or
             <command>mysqladmin reload</command> command, or by issuing
             a <literal>FLUSH PRIVILEGES</literal> statement.)
@@ -10193,7 +9677,7 @@
           </para>
 
           <para>
-            do not allow TCP/IP connections over the network. All
+            Do not allow TCP/IP connections over the network. All
             connections to <command>mysqld</command> must be made via
             Unix socket files. This option is unsuitable when using a
             MySQL version prior to 3.23.27 with the MIT-pthreads
@@ -10467,20 +9951,21 @@
 
         <listitem>
           <para>
-            Stage 1: The server checks whether it should allow you to
-            connect.
+            <emphasis role="bold">Stage 1</emphasis>: The server checks 
+            whether it should allow you to connect.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            Stage 2: Assuming that you can connect, the server checks
-            each statement you issue to see whether you have sufficient
-            privileges to perform it. For example, if you try to select
-            rows from a table in a database or drop a table from the
-            database, the server verifies that you have the
-            <literal>SELECT</literal> privilege for the table or the
-            <literal>DROP</literal> privilege for the database.
+            <emphasis role="bold">Stage 2</emphasis>: Assuming that you 
+            can connect, the server checks each statement you issue to 
+            see whether you have sufficient privileges to perform it. 
+            For example, if you try to select rows from a table in a 
+            database or drop a table from the database, the server 
+            verifies that you have the <literal>SELECT</literal> 
+            privilege for the table or the <literal>DROP</literal> 
+            privilege for the database.
           </para>
         </listitem>
 
@@ -10520,10 +10005,6 @@
         control. The columns in these grant tables are shown here:
       </para>
 
-<!--  TODO: Add Alter_routine_priv, Create_routine_priv, Execute_priv to -->
-
-<!--  host table after bug #8166 is fixed -->
-
       <informaltable>
         <tgroup cols="4">
           <colspec colwidth="25*"/>
@@ -10611,34 +10092,6 @@
             </row>
             <row>
               <entry/>
-              <entry><literal>Create_view_priv</literal></entry>
-              <entry><literal>Create_view_priv</literal></entry>
-              <entry><literal>Create_view_priv</literal></entry>
-            </row>
-            <row>
-              <entry/>
-              <entry><literal>Show_view_priv</literal></entry>
-              <entry><literal>Show_view_priv</literal></entry>
-              <entry><literal>Show_view_priv</literal>
-
-<!--  TODO: Create_routine_priv, Alter_routine_priv need to be added to host -->
-
-<!--  table, but that hasn't happened yet. --></entry>
-            </row>
-            <row>
-              <entry/>
-             
<entry><literal>Create_routine_priv</literal></entry>
-             
<entry><literal>Create_routine_priv</literal></entry>
-              <entry></entry>
-            </row>
-            <row>
-              <entry/>
-             
<entry><literal>Alter_routine_priv</literal></entry>
-             
<entry><literal>Alter_routine_priv</literal></entry>
-              <entry></entry>
-            </row>
-            <row>
-              <entry/>
               <entry><literal>References_priv</literal></entry>
               <entry><literal>References_priv</literal></entry>
               <entry><literal>References_priv</literal></entry>
@@ -10778,21 +10231,8 @@
         <literal>max_questions</literal>,
         <literal>max_updates</literal>, and
         <literal>max_connections</literal> columns were added in MySQL
-        4.0.2. <literal>Execute_priv</literal> is not operational until
-        MySQL 5.0.3, however.
-      </para>
-
-      <para>
-        The <literal>Create_view_priv</literal> and
-        <literal>Show_view_priv</literal> columns were added in MySQL
-        5.0.1.
-      </para>
-
-      <para>
-        The <literal>Create_routine_priv</literal>,
-        <literal>Alter_routine_priv</literal>, and
-        <literal>max_user_connections</literal> columns were added in
-        MySQL 5.0.3.
+        4.0.2. <literal>Execute_priv</literal> is not operational 
+        through MySQL 4.1.
       </para>
 
       <para>
@@ -10875,72 +10315,6 @@
       </para>
 
       <para>
-        For verification of requests that involve stored routines, the
-        server may consult the <literal>procs_priv</literal> table. This
-        table has the following columns:
-      </para>
-
-      <informaltable>
-        <tgroup cols="2">
-          <colspec colwidth="20*"/>
-          <colspec colwidth="20*"/>
-          <tbody>
-            <row>
-              <entry><emphasis role="bold">Table
Name</emphasis></entry>
-              <entry><emphasis
role="bold">procs_priv</emphasis></entry>
-            </row>
-            <row>
-              <entry><emphasis role="bold">Scope
columns</emphasis></entry>
-              <entry><literal>Host</literal></entry>
-            </row>
-            <row>
-              <entry/>
-              <entry><literal>Db</literal></entry>
-            </row>
-            <row>
-              <entry/>
-              <entry><literal>User</literal></entry>
-            </row>
-            <row>
-              <entry/>
-              <entry><literal>Routine_name</literal></entry>
-            </row>
-            <row>
-              <entry/>
-              <entry><literal>Routine_type</literal></entry>
-            </row>
-            <row>
-              <entry><emphasis role="bold">Privilege
columns</emphasis></entry>
-              <entry><literal>Proc_priv</literal></entry>
-            </row>
-            <row>
-              <entry><emphasis role="bold">Other
columns</emphasis></entry>
-              <entry><literal>Timestamp</literal></entry>
-            </row>
-            <row>
-              <entry/>
-              <entry><literal>Grantor</literal></entry>
-            </row>
-          </tbody>
-        </tgroup>
-      </informaltable>
-
-      <para>
-        The <literal>procs_priv</literal> table exists as of MySQL
-        5.0.3. The <literal>Routine_type</literal> column was added in
-        MySQL 5.0.6. It is an <literal>ENUM</literal> column with values
-        of <literal>'FUNCTION'</literal> or
-        <literal>'PROCEDURE'</literal> to indicate the type of routine
-        the row refers to. This column allows privileges to be granted
-        separately for a function and a procedure with the same name.
-      </para>
-
-      <para>
-        The <literal>Timestamp</literal> and
<literal>Grantor</literal>
-        columns currently are unused and are discussed no further here.
-      </para>
-
-      <para>
         Each grant table contains scope columns and privilege columns:
       </para>
 
@@ -11096,11 +10470,6 @@
               <entry><literal>Column_priv</literal></entry>
               <entry><literal>'Select', 'Insert', 'Update',
'References'</literal></entry>
             </row>
-            <row>
-              <entry><literal>procs_priv</literal></entry>
-              <entry><literal>Proc_priv</literal></entry>
-              <entry><literal>'Execute', 'Alter Routine',
'Grant'</literal></entry>
-            </row>
           </tbody>
         </tgroup>
       </informaltable>
@@ -11168,14 +10537,6 @@
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            The <literal>procs_priv</literal> table applies to stored
-            routines. A privilege granted at the routine level applies
-            only to a single routine.
-          </para>
-        </listitem>
-
       </itemizedlist>
 
       <para>
@@ -11256,9 +10617,8 @@
       <para>
         Information about account privileges is stored in the
         <literal>user</literal>, <literal>db</literal>,
-        <literal>host</literal>, <literal>tables_priv</literal>,
-        <literal>columns_priv</literal>, and
-        <literal>procs_priv</literal> tables in the
+        <literal>host</literal>, <literal>tables_priv</literal>,
and
+        <literal>columns_priv</literal> tables in the 
         <literal>mysql</literal> database. The MySQL server reads the
         contents of these tables into memory when it starts and re-reads
         them under the circumstances indicated in
@@ -11340,31 +10700,6 @@
               <entry>tables</entry>
             </row>
             <row>
-              <entry><literal>CREATE VIEW</literal></entry>
-              <entry><literal>Create_view_priv</literal></entry>
-              <entry>views</entry>
-            </row>
-            <row>
-              <entry><literal>SHOW VIEW</literal></entry>
-              <entry><literal>Show_view_priv</literal></entry>
-              <entry>views</entry>
-            </row>
-            <row>
-              <entry><literal>ALTER ROUTINE</literal></entry>
-             
<entry><literal>Alter_routine_priv</literal></entry>
-              <entry>stored routines</entry>
-            </row>
-            <row>
-              <entry><literal>CREATE ROUTINE</literal></entry>
-             
<entry><literal>Create_routine_priv</literal></entry>
-              <entry>stored routines</entry>
-            </row>
-            <row>
-              <entry><literal>EXECUTE</literal></entry>
-              <entry><literal>Execute_priv</literal></entry>
-              <entry>stored routines</entry>
-            </row>
-            <row>
               <entry><literal>FILE</literal></entry>
               <entry><literal>File_priv</literal></entry>
               <entry>file access on server host</entry>
@@ -11429,14 +10764,11 @@
         <literal>REPLICATION CLIENT</literal>, <literal>REPLICATION
         SLAVE</literal>, <literal>SHOW DATABASES</literal>, and
         <literal>SUPER</literal> privileges were added in MySQL 4.0.2.
-        (<literal>EXECUTE</literal> is not operational until MySQL
-        5.0.3.) <literal>CREATE VIEW</literal> and <literal>SHOW
-        VIEW</literal> were added in MySQL 5.0.1. <literal>CREATE
-        USER</literal>, <literal>CREATE ROUTINE</literal>, and
-        <literal>ALTER ROUTINE</literal> were added in MySQL 5.0.3. To
-        use these privileges when upgrading from an earlier version of
-        MySQL that does not have them, you must upgrade your grant
-        tables. See <xref linkend="upgrading-grant-tables"/>.
+        (<literal>EXECUTE</literal> is not used in any MySQL version 
+        through the 4.1 release series.) To use these privileges when 
+        upgrading from an earlier version of MySQL that does not have 
+        them, you must upgrade your grant tables. See 
+        <xref linkend="upgrading-grant-tables"/>.
       </para>
 
       <para>
@@ -11485,15 +10817,6 @@
       </para>
 
       <para>
-        The <literal>CREATE ROUTINE</literal> privilege is needed for
-        creating stored routines (functions and procedures).
-        <literal>ALTER ROUTINE</literal> privilege is needed for
-        altering or dropping stored routines, and
-        <literal>EXECUTE</literal> is needed for executing stored
-        routines.
-      </para>
-
-      <para>
         The <literal>GRANT</literal> privilege allows you to give to
         other users those privileges that you yourself possess. It can
         be used for databases, tables, and stored routines.
@@ -11756,8 +11079,8 @@
       </indexterm>
 
       <para>
-        MySQL client programs generally expect you to specify connection
-        parameters when you want to access a MySQL server:
+        MySQL client programs generally expect you to specify these 
+        connection parameters when you want to access a MySQL server:
       </para>
 
       <itemizedlist>
@@ -11793,19 +11116,19 @@
 </programlisting>
 
       <para>
-        Alternate forms of the <literal>-h</literal>,
-        <literal>-u</literal>, and <literal>-p</literal> options
are
+        Alternate forms of the <option>-h</option>,
<option>-u</option>, 
+        and <option>-p</option> options are
        
<option>--host=<replaceable>host_name</replaceable></option>,
        
<option>--user=<replaceable>user_name</replaceable></option>,
         and
        
<option>--password=<replaceable>your_pass</replaceable></option>.
         Note that there is <emphasis>no space</emphasis> between
-        <literal>-p</literal> or <option>--password=</option> and
the
+        <option>-p</option> or <option>--password=</option> and
the
         password following it.
       </para>
 
       <para>
-        If you use a <literal>-p</literal> or
+        If you use a <option>-p</option> or
         <option>--password</option> option but do not specify the
         password value, the client program prompts you to enter the
         password. The password is not displayed as you enter it. This is
@@ -11837,7 +11160,7 @@
 
         <listitem>
           <para>
-            No password is supplied if <literal>-p</literal> is missing.
+            No password is supplied if <option>-p</option> is missing.
           </para>
         </listitem>
 
@@ -12166,10 +11489,10 @@
         connection process when checking whether the password is
         correct. (This is done without the encrypted password ever
         traveling over the connection.) From MySQL's point of view, the
-        encrypted password is the REAL password, so you should not give
-        anyone access to it! In particular, do not give
-        non-administrative users read access to the tables in the
-        <literal>mysql</literal> database!
+        encrypted password is the <emphasis>real</emphasis> password, so 
+        you should never give anyone access to it. In particular, 
+        <emphasis>do not give non-administrative users read access to 
+        tables in the <literal>mysql</literal> database</emphasis>.
       </para>
 
       <para>
@@ -12441,9 +11764,9 @@
       <para>
         The <literal>CURRENT_USER()</literal> function is available as
         of MySQL 4.0.6. See <xref linkend="information-functions"/>.
-        Another thing you can do to diagnose authentication problems is
-        to print out the <literal>user</literal> table and sort it by
-        hand to see where the first match is being made.
+        Another way to diagnose authentication problems is to print out 
+        the <literal>user</literal> table and sort it by hand to see 
+        where the first match is being made.
       </para>
 
     </section>
@@ -12911,18 +12234,18 @@
 
       <title id='title-access-denied'>&title-access-denied;</title>
 
-<!--  TODO: some of these items apply only to old systems and are now more -->
-
-<!--  of archaeological than practical value. Probably should move them to -->
-
-<!--  the end of the list. -->
-
       <para>
         If you encounter problems when you try to connect to the MySQL
         server, the following items describe some courses of action you
         can take to correct the problem.
       </para>
 
+<!--  
+      TODO: some of these items apply only to old systems and are now 
+      more of archaeological than practical value. Probably should move 
+      them to the end of the list. 
+-->
+
       <itemizedlist>
 
         <listitem>
@@ -12962,7 +12285,7 @@
           <para>
             The grant tables must be properly set up so that the server
             can use them for access control. For some distribution types
-            (such as binary distributions on Windows on RPM
+            (such as binary distributions on Windows, or RPM
             distributions on Linux), the installation process
             initializes the <literal>mysql</literal> database containing
             the grant tables. For distributions that do not do this, you
@@ -13009,7 +12332,7 @@
             <literal>root</literal> user has no password initially. That
             is also a security risk, so setting the password for the
             <literal>root</literal> accounts is something you should do
-            while you're setting up your other MySQL users. For
+            while you are setting up your other MySQL users. For
             instructions on setting the initial passwords, see
             <xref linkend="default-privileges"/>.
           </para>
@@ -13071,8 +12394,8 @@
             In this case, you must restart the server with the
             <option>--skip-grant-tables</option> option and edit your
             <filename>/etc/hosts</filename> or
-            <filename>\windows\hosts</filename> file to add an entry for
-            your host.
+           
<filename>\<replaceable>%WINDIR%</replaceable>\SYSTEM32\hosts</filename>

+            file to add an entry for your host.
           </para>
 
           <indexterm type="concept">
@@ -13102,7 +12425,7 @@
             option files. For example, if you get <literal>Access
             denied</literal> when you run a client without any options,
             make sure that you haven't specified an old password in any
-            of your option files!
+            of your option files.
           </para>
 
           <para>
@@ -13181,11 +12504,10 @@
           <para>
             The <literal>PASSWORD()</literal> function is unnecessary
             when you specify a password using the
-            <literal>GRANT</literal> or (beginning with MySQL 5.0.2)
-            <literal>CREATE USER</literal> statements, or the
-            <command>mysqladmin password</command> command, all of which
-            automatically use <literal>PASSWORD()</literal> to encrypt
-            the password. See <xref linkend="passwords"/>.
+            <literal>GRANT</literal> statement or the
+            <command>mysqladmin password</command> command, both of 
+            which automatically use <literal>PASSWORD()</literal> to 
+            encrypt the password. See <xref linkend="passwords"/>.
           </para>
         </listitem>
 
@@ -13246,7 +12568,7 @@
             hostname and username that were given in the error message.
             For example, if you get an error message that contains
             <literal>using password: NO</literal>, it means that you
-            tried to log in without an password.
+            tried to log in without a password.
           </para>
         </listitem>
 
@@ -13268,20 +12590,31 @@
             combination of client hostname and username that you are
             using when trying to connect.
           </para>
-
+<!--  
+      NOTE: I changed the instructions to restart the server using -log 
+      because it's not necessary since 3.22.something when the output 
+      from USER() started including the hostname. [js] 
+-->
           <para>
             If you do not know the IP number or hostname of the machine
-            from which you are connecting, you should put an row with
+            from which you are connecting, you should put a row with
             <literal>'%'</literal> as the <literal>Host</literal>
column
-            value in the <literal>user</literal> table and restart
-            <command>mysqld</command> with the
<option>--log</option>
-            option on the server machine. After trying to connect from
-            the client machine, the information in the MySQL log
-            indicates how you really did connect. (Then change the
-            <literal>'%'</literal> in the <literal>user</literal>
table
-            row to the actual hostname that shows up in the log.
-            Otherwise, you'll have a system that is insecure because it
-            allows connections from any host for the given username.)
+            value in the <literal>user</literal> table. After trying to 
+            connect from the client machine, use a <literal>SELECT 
+            USER()</literal> query to see how you really did connect. 
+            (Then change the <literal>'%'</literal> in the 
+            <literal>user</literal> table row to the actual hostname 
+            that shows up in the log. Otherwise, your system is left 
+            insecure because it allows connections from any host for the 
+            given username.)
+          </para>
+          
+          <para>
+            (Note that if you are running a version of MySQL older than 
+            3.23.11, the output from <literal>USER()</literal> does not 
+            include the hostname. In this case, you must restart the 
+            server with the <option>--log</option> option, then obtain 
+            the hostname from the log.)
           </para>
 
           <para>
@@ -13324,8 +12657,7 @@
 
             <listitem>
               <para>
-                Try to find out what is wrong with your DNS server and
-                fix it.
+                Find out what is wrong with your DNS server and fix it.
               </para>
             </listitem>
 
@@ -13405,8 +12737,7 @@
             a <literal>Host</literal> value that contains a wildcard;
             for example, <literal>'tcx.%'</literal>. However, use of
             hostnames ending with '<literal>%</literal>' is
-            <emphasis>insecure</emphasis> and is
-            <emphasis>not</emphasis> recommended!)
+            insecure and is <emphasis>not</emphasis> recommended.)
           </para>
         </listitem>
 
@@ -13535,7 +12866,7 @@
             <replaceable>db_name</replaceable></literal>. If you are
             able to connect using the <command>mysql</command> client,
             the problem lies with your program, not with the access
-            privileges. (There is no space between <literal>-p</literal>
+            privileges. (There is no space between <option>-p</option>
             and the password; you can also use the
            
<option>--password=<replaceable>your_pass</replaceable></option>
             syntax to specify the password. If you use the
@@ -15627,7 +14958,7 @@
           To use SSL connections between the MySQL server and client
           programs, your system must be able to support OpenSSL and your
           version of MySQL must be 4.0.0 or newer.
-          If you're using a MySQL version with built-in yaSSL support
+          If you are using a MySQL version with built-in yaSSL support
           (as of version 5.0.10), do not read this section, but rather
           <xref linkend="secure-using-yassl"/>.
         </para>
@@ -22306,7 +21637,7 @@
           versions of MySQL that are installed at
           <filename>C:\mysql-4.0.8</filename> and
           <filename>C:\mysql-4.0.17</filename>, respectively. (This
-          might be the case if you're running 4.0.8 as your production
+          might be the case if you are running 4.0.8 as your production
           server, but want to test 4.0.17 before upgrading to it.)
         </para>
 
@@ -22854,7 +22185,7 @@
 
     <para>
       <emphasis role="bold">Note</emphasis>: The query cache is not used
-      for server-side prepared statements. If you're using server-side
+      for server-side prepared statements. If you are using server-side
       prepared statements consider that these statement will not be
       satisfied by the query cache. See
       <xref linkend="c-api-prepared-statements"/>.
@@ -22870,7 +22201,7 @@
 
       <listitem>
         <para>
-          If all the queries you're performing are simple (such as
+          If all the queries you are performing are simple (such as
           selecting a row from a table with one row), but still differ
           so that the queries cannot be cached, the overhead for having
           the query cache active is 13%. This could be regarded as the

--- 1.39/refman-5.0/mysql-database-administration.xml	2005-08-04 15:56:20 +10:00
+++ 1.40/refman-5.0/mysql-database-administration.xml	2005-08-05 19:39:01 +10:00
@@ -14437,20 +14437,25 @@
             combination of client hostname and username that you are
             using when trying to connect.
           </para>
+          
+<!--  
+      NOTE: I changed the instructions to restart the server using -log 
+      because it's not necessary since 3.22.11 when the output 
+      from USER() started including the hostname. [js] 
+-->
 
           <para>
-            If you don't know the IP number or hostname of the machine
-            from which you are connecting, you should put an row with
+            If you do not know the IP number or hostname of the machine
+            from which you are connecting, you should put a row with
             <literal>'%'</literal> as the <literal>Host</literal>
column
-            value in the <literal>user</literal> table and restart
-            <command>mysqld</command> with the
<literal>--log</literal>
-            option on the server machine. After trying to connect from
-            the client machine, the information in the MySQL log
-            indicates how you really did connect. (Then change the
-            <literal>'%'</literal> in the <literal>user</literal>
table
-            row to the actual hostname that shows up in the log.
-            Otherwise, you'll have a system that is insecure because it
-            allows connections from any host for the given username.)
+            value in the <literal>user</literal> table. After trying to 
+            connect from the client machine, use a <literal>SELECT 
+            USER()</literal> query to see how you really did connect. 
+            (Then change the <literal>'%'</literal> in the 
+            <literal>user</literal> table row to the actual hostname 
+            that shows up in the log. Otherwise, your system is left 
+            insecure because it allows connections from any host for the 
+            given username.)
           </para>
 
           <para>

--- 1.38/refman/mysql-database-administration.xml	2005-08-04 15:56:20 +10:00
+++ 1.39/refman/mysql-database-administration.xml	2005-08-05 19:39:01 +10:00
@@ -14846,22 +14846,35 @@
           <para>
             You can fix this by setting up an account for the
             combination of client hostname and username that you are
-            using when trying to connect.
+            using when trying to connect.          
           </para>
+          
+<!--  
+      NOTE: I changed the instructions to restart the server using 
+      - -log because it's not necessary since 3.22.11, when the output 
+      of USER() started including the hostname. [js] 
+-->
 
           <para>
-            If you don't know the IP number or hostname of the machine
-            from which you are connecting, you should put an row with
+            If you do not know the IP number or hostname of the machine
+            from which you are connecting, you should put a row with
             <literal>'%'</literal> as the <literal>Host</literal>
column
-            value in the <literal>user</literal> table and restart
-            <command>mysqld</command> with the
<literal>--log</literal>
-            option on the server machine. After trying to connect from
-            the client machine, the information in the MySQL log
-            indicates how you really did connect. (Then change the
-            <literal>'%'</literal> in the <literal>user</literal>
table
-            row to the actual hostname that shows up in the log.
-            Otherwise, you'll have a system that is insecure because it
-            allows connections from any host for the given username.)
+            value in the <literal>user</literal> table. After trying to 
+            connect from the client machine, use a <literal>SELECT 
+            USER()</literal> query to see how you really did connect. 
+            (Then change the <literal>'%'</literal> in the 
+            <literal>user</literal> table row to the actual hostname 
+            that shows up in the log. Otherwise, your system is left 
+            insecure because it allows connections from any host for the 
+            given username.)
+          </para>
+          
+          <para>
+            (Note that if you are running a version of MySQL older than 
+            3.23.11, the output from <literal>USER()</literal> does not 
+            include the hostname. In this case, you must restart the 
+            server with the <option>--log</option> option, then obtain 
+            the hostname from the log.)
           </para>
 
           <para>
Thread
bk commit - mysqldoc@docsrva tree (jon:1.3175)jon5 Aug