List:Commits« Previous MessageNext Message »
From:jon Date:October 24 2007 2:30pm
Subject:svn commit - mysqldoc@docsrva: r8287 - in trunk: dynamic-docs/changelog dynamic-docs/command-optvars refman-5.1 refman-5.2
View as plain text  
Author: jstephens
Date: 2007-10-24 14:30:17 +0200 (Wed, 24 Oct 2007)
New Revision: 8287

Log:

Documentation for WL#432 (Replication Beartbeats):

- CHANGE MASTER TO ... MASTER_HEARTBEAT_PERIOD = interval

- Server status variables: 
  - Slave_heartbeat_period
  - Slave_received_heartbeats

- Fixes for Replication bugs:
  - Bug #20435
  - Bug #29309
  - Bug #30932

- MCCGE feature listing update



Modified:
   trunk/dynamic-docs/changelog/mysqld.xml
   trunk/dynamic-docs/command-optvars/mysqld.xml
   trunk/refman-5.1/dba-core.xml
   trunk/refman-5.1/mysql-cluster-cge.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-5.2/dba-core.xml
   trunk/refman-5.2/sql-syntax.xml


Modified: trunk/dynamic-docs/changelog/mysqld.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld.xml	2007-10-24 10:59:02 UTC (rev 8286)
+++ trunk/dynamic-docs/changelog/mysqld.xml	2007-10-24 12:30:17 UTC (rev 8287)
Changed blocks: 3, Lines Added: 82, Lines Deleted: 30; 3789 bytes

@@ -6,6 +6,85 @@
 ]>
 <changelog>
 
+  <logentry entrytype="feature">
+
+    <tags>
+      <manual type="replication"/>
+      <manual type="cluster"/>
+      <manual type="slave_net_timeout"/>
+      <manual type="CHANGE MASTER TO"/>
+      <manual type="Seconds_behind_master"/>
+      <manual type="SHOW SLAVE STATUS"/>
+      <manual type="FLUSH LOGS"/>
+      <highlight type="clusterreplication"/>
+    </tags>
+
+    <bugs>
+      <fixes bugid="20435"></fixes>
+      <fixes bugid="29309"></fixes>
+      <fixes bugid="30932"></fixes>
+    </bugs>
+
+    <versions>
+      <version ver="5.1.22-ndb-6.3.4"/>
+    </versions>
+
+    <message>
+
+      <para>
+        A replication heartbeat mechanism has been added to facilitate
+        monitoring. This provides an alternative to checking log files,
+        making it possible to detect in real time when a slave has
+        failed.
+      </para>
+
+      <para>
+        Configuration of heartbeats is done via a new
+        <literal>MASTER_HEARTBEAT_PERIOD =
+        <replaceable>interval</replaceable> clause for the
+        </literal><literal>CHANGE MASTER TO </literal> statement (see
+        <xref linkend="change-master-to"/>); monitoring can be done by
+        checking the values of the status variables
+        <literal>Slave_heartbeat_period</literal> and
+        <literal>Slave_received_heartbeats</literal> (see
+        <xref linkend="server-status-variables"/>).
+      </para>
+
+      <para>
+        The addition of replication heartbeats addresses a number of
+        issues:
+        <itemizedlist>
+
+          <listitem>
+            <para>
+              Relay logs were rotated every
+              <literal>slave_net_timeout</literal> seconds even if no
+              statements were being replicated. (Bug #24035)
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              <literal>SHOW SLAVE STATUS</literal> displayed an
+              incorrect value for
+              <literal>seconds_behind_master</literal> following a
+              <literal>FLUSH LOGS</literal> statement. (Bug #29309)
+            </para>
+          </listitem>
+          <listitem>
+            <para>
+              Replication master-slave connections used
+              <literal>slave_net_timeout</literal> for connection
+              timeouts. (Bug #30932)
+            </para>
+          </listitem>
+
+        </itemizedlist>
+      </para>
+
+    </message>
+
+  </logentry>
+
   <logentry entrytype="bug">
 
     <tags>

@@ -78629,8 +78708,9 @@
     <message>
 
       <para>
-        mysqld processes did not always detect cluster shutdown, leading
-        to issues with CLuster replication and schema distribution.
+        <command>mysqld</command> processes did not always detect
+        cluster shutdown, leading to issues with Cluster replication and
+        schema distribution.
       </para>
 
     </message>

@@ -78640,34 +78720,6 @@
   <logentry entrytype="bug">
 
     <tags>
-      <highlight type="clusterreplication"/>
-      <manual type="replication"/>
-      <manual type="slave_net_timeout"/>
-    </tags>
-
-    <bugs>
-      <fixes bugid="20435"/>
-    </bugs>
-
-    <versions>
-      <version ver="5.1.22-ndb-6.3.4"/>
-    </versions>
-
-    <message>
-
-      <para>
-        Relay logs were rotated every
-        <literal>slave_net_timeout</literal> seconds even if no
-        statements were being replicated.
-      </para>
-
-    </message>
-
-  </logentry>
-
-  <logentry entrytype="bug">
-
-    <tags>
       <manual type="LESS THAN"/>
       <manual type="partitioning"/>
     </tags>


Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2007-10-24 10:59:02 UTC (rev 8286)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2007-10-24 12:30:17 UTC (rev 8287)
Changed blocks: 375, Lines Added: 930, Lines Deleted: 896; 178442 bytes

@@ -1,7 +1,5 @@
 <!DOCTYPE options SYSTEM "options.dtd">
-<options>
-
-  <option command="mysqld" section="server" id="Aborted_connects">
+  <options><option command="mysqld" section="server" id="Aborted_connects">
     <xrefto id="option_mysqld_Aborted_connects"/>
     <name>Aborted_connects</name>
     <shortdescription lang="en">The number of failed attempts to connect to the MySQL server</shortdescription>

@@ -15,12 +13,14 @@
       <manual version="5.1"/>
       <manual version="5.2"/>
     </versions>
+  
   </option>
+  
   <option command="mysqld" section="binlog" id="Binlog_cache_disk_use">
     <xrefto id="option_mysqld_Binlog_cache_disk_use"/>
     <name>Binlog_cache_disk_use</name>
     <shortdescription lang="en">The number of transactions that used a temporary file instead of the
-      temporary binary log cache</shortdescription>
+        temporary binary log cache</shortdescription>
     <seealso xref="binlog_cache_size"/>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>

@@ -34,6 +34,7 @@
       <manual version="5.2"/>
     </versions>
   </option>
+  
   <option command="mysqld" section="replication" id="have_row_based_replication">
     <xrefto id="option_mysqld_have_row_based_replication"/>
     <name>have_row_based_replication</name>

@@ -409,7 +410,7 @@
   <option command="mysqld" section="server" id="Com_delete_multi">
     <xrefto id="option_mysqld_Com_option_mysqld"/>
     <name>Com_delete_multi</name>
-<!-- is this correct? -->
+  <!-- is this correct? -->
     <shortdescription lang="en">Count of multiple table DELETE statements</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>

@@ -1739,7 +1740,7 @@
     <xrefto id="option_mysqld_Compression"/>
     <name>Compression</name>
     <shortdescription lang="en">Whether the client connection uses compression in the client/server
-      protocol</shortdescription>
+        protocol</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="session"/>
     </types>

@@ -1769,7 +1770,7 @@
     <xrefto id="option_mysqld_Created_tmp_disk_tables"/>
     <name>Created_tmp_disk_tables</name>
     <shortdescription lang="en">The number of temporary tables on disk created automatically by the
-      server while executing statements</shortdescription>
+        server while executing statements</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -1815,7 +1816,7 @@
     <xrefto id="option_mysqld_Delayed_errors"/>
     <name>Delayed_errors</name>
     <shortdescription lang="en">The number of rows written with INSERT DELAYED for which some error
-      occurred</shortdescription>
+        occurred</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="global"/>
     </types>

@@ -2022,7 +2023,7 @@
     <xrefto id="option_mysqld_Handler_rollback"/>
     <name>Handler_rollback</name>
     <shortdescription lang="en">The number of requests for a storage engine to perform a rollback
-      operation</shortdescription>
+        operation</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2053,7 +2054,7 @@
     <xrefto id="option_mysqld_Handler_savepoint_rollback"/>
     <name>Handler_savepoint_rollback</name>
     <shortdescription lang="en">The number of requests for a storage engine to roll back to a
-      savepoint</shortdescription>
+        savepoint</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2099,7 +2100,7 @@
     <xrefto id="option_mysqld_Key_blocks_not_flushed"/>
     <name>Key_blocks_not_flushed</name>
     <shortdescription lang="en">The number of key blocks in the key cache that have changed but have
-      not yet been flushed to disk</shortdescription>
+        not yet been flushed to disk</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2207,20 +2208,20 @@
     <xrefto id="option_mysqld_Last_query_cost"/>
     <name>Last_query_cost</name>
     <shortdescription lang="en">The total cost of the last compiled query as computed by the query
-      optimizer</shortdescription>
+        optimizer</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="global" inversion="5.0.1" outversion="5.0.7"/>
       <vartype isdynamic="no" class="status" scope="both" inversion="5.0.7"/>
     </types>
     <values vartype="numeric" platform="all" inversion="5.0.1" outversion="5.0.7">
-
+  
       <value default="-1"/>
-
+  
     </values>
     <values vartype="numeric" platform="all" inversion="5.0.7">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -2233,7 +2234,7 @@
     <xrefto id="option_mysqld_Max_used_connections"/>
     <name>Max_used_connections</name>
     <shortdescription lang="en">The maximum number of connections that have been in use
-      simultaneously since the server started</shortdescription>
+        simultaneously since the server started</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2249,14 +2250,14 @@
     <xrefto id="option_mysqld_Ndb_number_of_data_nodes"/>
     <name>Ndb_number_of_data_nodes</name>
     <shortdescription lang="en">If the server is part of a MySQL Cluster, the value of this variable
-      is the number of data nodes in the cluster</shortdescription>
+        is the number of data nodes in the cluster</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -2268,16 +2269,16 @@
     <xrefto id="option_mysqld_Ndb_conflict_fn_max"/>
     <name>Ndb_conflict_fn_max</name>
     <shortdescription lang="en">If the server is part of a MySQL Cluster
-      involved in cluster replication, the value of this variable
-      indicates the number of times that conflict resolution based on
-      "greater timestamp wins" has been applied</shortdescription>
+        involved in cluster replication, the value of this variable
+        indicates the number of times that conflict resolution based on
+        "greater timestamp wins" has been applied</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -2289,16 +2290,16 @@
     <xrefto id="option_mysqld_Ndb_conflict_fn_old"/>
     <name>Ndb_conflict_fn_old</name>
     <shortdescription lang="en">If the server is part of a MySQL Cluster
-      involved in cluster replication, the value of this variable
-      indicates the number of times that "same timestamp wins" conflict
-      resolution has been applied</shortdescription>
+        involved in cluster replication, the value of this variable
+        indicates the number of times that "same timestamp wins" conflict
+        resolution has been applied</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -2459,7 +2460,7 @@
     <xrefto id="option_mysqld_Qcache_lowmem_prunes"/>
     <name>Qcache_lowmem_prunes</name>
     <shortdescription lang="en">The number of queries that were deleted from the query cache because
-      of low memory</shortdescription>
+        of low memory</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2475,7 +2476,7 @@
     <xrefto id="option_mysqld_Qcache_not_cached"/>
     <name>Qcache_not_cached</name>
     <shortdescription lang="en">The number of non-cached queries (not cacheable, or not cached due
-      to the query_cache_type setting)</shortdescription>
+        to the query_cache_type setting)</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2549,7 +2550,7 @@
     <xrefto id="option_mysqld_Select_full_join"/>
     <name>Select_full_join</name>
     <shortdescription lang="en">The number of joins that perform table scans because they do not use
-      indexes</shortdescription>
+        indexes</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2595,7 +2596,7 @@
     <xrefto id="option_mysqld_Select_range_check"/>
     <name>Select_range_check</name>
     <shortdescription lang="en">The number of joins without keys that check for key usage after each
-      row</shortdescription>
+        row</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2622,11 +2623,26 @@
       <manual version="5.2"/>
     </versions>
   </option>
+  <option command="mysqld" section="replication" id="Slave_heartbeat_period">
+    <xrefto id="option_mysqld_Slave_heartbeat_period"/>
+    <name>Slave_heartbeat_period</name>
+    <shortdescription lang="en">The time, in seconds, that elapses
+        between replication heartbeats</shortdescription>
+    <types>
+      <vartype isdynamic="no" class="status" scope="global"/>
+    </types>
+    <values vartype="numeric" platform="all"/>
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.22-ndb-6.3.4"/>
+      <manual version="5.2"/>
+    </versions>
+  </option>
   <option command="mysqld" section="replication" id="Slave_open_temp_tables">
     <xrefto id="option_mysqld_Slave_open_temp_tables"/>
     <name>Slave_open_temp_tables</name>
     <shortdescription lang="en">The number of temporary tables that the slave SQL thread currently
-      has open</shortdescription>
+        has open</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2638,11 +2654,27 @@
       <manual version="5.2"/>
     </versions>
   </option>
+  <option command="mysqld" section="replication" id="Slave_received_heartbeats">
+    <xrefto id="option_mysqld_Slave_received_heartbeats"/>
+    <name>Slave_received_heartbeats</name>
+    <shortdescription lang="en">The number of replication heartbeats
+        received by a replication slave since the last time the slave was
+        restarted or reset</shortdescription>
+    <types>
+      <vartype isdynamic="no" class="status" scope="global"/>
+    </types>
+    <values vartype="numeric" platform="all"/>
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.22-ndb-6.3.4"/>
+      <manual version="5.2"/>
+    </versions>
+  </option>
   <option command="mysqld" section="replication" id="Slave_retried_transactions">
     <xrefto id="option_mysqld_Slave_retried_transactions"/>
     <name>Slave_retried_transactions</name>
     <shortdescription lang="en">The total number of times since startup that the replication slave
-      SQL thread has retried transactions</shortdescription>
+        SQL thread has retried transactions</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2672,7 +2704,7 @@
     <xrefto id="option_mysqld_Slow_launch_threads"/>
     <name>Slow_launch_threads</name>
     <shortdescription lang="en">The number of threads that have taken more than slow_launch_time
-      seconds to create</shortdescription>
+        seconds to create</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2688,7 +2720,7 @@
     <xrefto id="option_mysqld_Slow_queries"/>
     <name>Slow_queries</name>
     <shortdescription lang="en">The number of queries that have taken more than long_query_time
-      seconds</shortdescription>
+        seconds</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2779,7 +2811,7 @@
     <xrefto id="option_mysqld_Table_locks_waited"/>
     <name>Table_locks_waited</name>
     <shortdescription lang="en">The number of times that a table lock could not be acquired
-      immediately and a wait was needed</shortdescription>
+        immediately and a wait was needed</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2795,9 +2827,9 @@
     <xrefto id="option_mysqld_Tc_log_max_pages_used"/>
     <name>Tc_log_max_pages_used</name>
     <shortdescription lang="en">When the memory-mapped implementation of the log that is used by
-      mysqld acts as the transaction coordinator for recovery of internal XA
-      transactions,this variable indicates the largest number of pages used for the log since the
-      server started</shortdescription>
+        mysqld acts as the transaction coordinator for recovery of internal XA
+        transactions,this variable indicates the largest number of pages used for the log since the
+        server started</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2813,7 +2845,7 @@
     <xrefto id="option_mysqld_Tc_log_page_size"/>
     <name>Tc_log_page_size</name>
     <shortdescription lang="en">The page size used for the memory-mapped implementation of the XA
-      recovery log</shortdescription>
+        recovery log</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2829,8 +2861,8 @@
     <xrefto id="option_mysqld_Tc_log_page_waits"/>
     <name>Tc_log_page_waits</name>
     <shortdescription lang="en">For the memory-mapped implementation of the recovery log, this
-      variable increments each time the server was not able to commit a transaction and had to wait
-      for a free page in the log</shortdescription>
+        variable increments each time the server was not able to commit a transaction and had to wait
+        for a free page in the log</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -2918,8 +2950,8 @@
     </versions>
   </option>
   <option command="mysqld" section="server" id="Uptime_since_flush_status">
-<!-- This one is Community only! -->
-<!--    <xrefto id="option_mysqld_Uptime_since_flush_status"/> -->
+  <!-- This one is Community only! -->
+  <!--    <xrefto id="option_mysqld_Uptime_since_flush_status"/> -->
     <name>Uptime_since_flush_status</name>
     <shortdescription lang="en">The number of seconds since the most recent FLUSH STATUS</shortdescription>
     <types>

@@ -2940,9 +2972,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -2955,15 +2987,15 @@
     <xrefto id="option_mysqld_allow-suspicious-udfs"/>
     <name>allow-suspicious-udfs</name>
     <shortdescription lang="en">Allows use of UDFs consisting of only one symbol xxx() without
-      corresponding xxx_init() or xxx_deinit()</shortdescription>
+        corresponding xxx_init() or xxx_deinit()</shortdescription>
     <types>
       <optype class="cmdline" format="--allow-suspicious-udfs" setvar="allow-suspicious-udfs"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -2998,14 +3030,14 @@
     <seealso xref="auto-increment-offset"/>
     <types>
       <optype class="cmdline" format="--auto-increment-increment[=#]"
-        setvar="auto_increment_increment"/>
+          setvar="auto_increment_increment"/>
       <optype class="mycnf" format="auto_increment_increment"/>
       <vartype class="system" isdynamic="no" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -3025,9 +3057,9 @@
       <vartype class="system" isdynamic="no" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -3064,9 +3096,9 @@
       <vartype class="system" isdynamic="no" scope="global"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -3096,7 +3128,7 @@
     <xrefto id="option_mysqld_basedir"/>
     <name>basedir</name>
     <shortdescription lang="en">Path to installation directory. All paths are usually resolved
-      relative to this</shortdescription>
+        relative to this</shortdescription>
     <seealso xref="datadir"/>
     <types>
       <optype class="cmdline" format="--basedir=name" setvar="basedir"/>

@@ -3121,9 +3153,9 @@
       <vartype class="system" scope="global" format="have_bdb" outversion="5.1.12" isdynamic="no"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -3155,12 +3187,12 @@
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <choice value="DEFAULT"/>
       <choice value="OLDEST"/>
       <choice value="RANDOM"/>
       <choice value="YOUNGEST"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -3215,10 +3247,10 @@
     <seealso xref="bdb-shared-data"/>
     <types>
       <optype class="cmdline" format="--bdb-shared-data" outversion="5.1.12"
-        setvar="bdb_shared_data"/>
+          setvar="bdb_shared_data"/>
       <optype class="mycnf" format="bdb_shared_data"/>
       <vartype class="system" scope="global"  outversion="5.1.12"
-        isdynamic="no"/>
+          isdynamic="no"/>
     </types>
     <versions>
       <manual version="4.1"/>

@@ -3247,10 +3279,10 @@
     <seealso xref="skip-bdb"/>
     <types>
       <optype class="cmdline" format="--bdb_cache_size=#" outversion="5.1.12"
-        setvar="bdb_cache_size"/>
+          setvar="bdb_cache_size"/>
       <optype class="mycnf" format="bdb_cache_size" outversion="5.1.12"/>
       <vartype class="system" scope="both" isdynamic="no" 
-        outversion="5.1.12"/>
+          outversion="5.1.12"/>
     </types>
     <values vartype="numeric" platform="all"/>
     <versions>

@@ -3268,9 +3300,9 @@
       <vartype class="system" scope="global" isdynamic="no" outversion="5.1.12"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="10000"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -3283,7 +3315,7 @@
     <shortdescription lang="en">The buffer that is allocated to cache index and rows for BDB tables</shortdescription>
     <types>
       <optype class="cmdline" format="--bdb_log_buffer_size=#" setvar="bdb_log_buffer_size"
-        outversion="5.1.12"/>
+          outversion="5.1.12"/>
       <optype class="mycnf" format="bdb_log_buffer_size" outversion="5.1.12"/>
       <vartype class="system" scope="global" isdynamic="no" outversion="5.1.12"/>
     </types>

@@ -3344,11 +3376,11 @@
     </versions>
   </option>
   <option command="mysqld" section="binlog" id="binlog-ignore-db">
-<!-- checked-->
+  <!-- checked-->
     <xrefto id="option_mysqld_binlog-ignore-db"/>
     <name>binlog-ignore-db</name>
     <shortdescription lang="en">Tells the master that updates to the given database should not be
-      logged to the binary log</shortdescription>
+        logged to the binary log</shortdescription>
     <types>
       <optype class="cmdline" format="--binlog-ignore-db=name"/>
       <optype class="mycnf"/>

@@ -3380,16 +3412,16 @@
     <xrefto id="option_mysqld_binlog_cache_size"/>
     <name>binlog_cache_size</name>
     <shortdescription lang="en">The size of the cache to hold the SQL statements for the binary log
-      during a transaction</shortdescription>
+        during a transaction</shortdescription>
     <types>
       <optype class="cmdline" format="--binlog_cache_size=#" setvar="binlog_cache_size"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="yes"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="32768"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -3410,12 +3442,12 @@
       <vartype class="system" isdynamic="no" scope="global" inversion="5.1.8"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <value default="row"/>
       <choice value="row"/>
       <choice value="statement"/>
       <choice value="mixed"/>
-
+  
     </values>
     <versions>
       <introduced version="5.1.5"/>

@@ -3448,9 +3480,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="8388608"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -3466,12 +3498,12 @@
     <seealso xref="skip-character-set-client-handshake"/>
     <types>
       <optype class="cmdline" format="--character-set-client-handshake"
-        setvar="character-set-client-handshake"/>
+          setvar="character-set-client-handshake"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -3487,7 +3519,7 @@
     <shortdescription lang="en">Set the filesystem character set</shortdescription>
     <types>
       <optype class="cmdline" format="--character-set-filesystem=name"
-        setvar="character_set_filesystem"/>
+          setvar="character_set_filesystem"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="both" isdynamic="yes"/>
     </types>

@@ -3504,7 +3536,7 @@
     <xrefto id="option_mysqld_character-set-server"/>
     <name>character-set-server</name>
     <shortdescription lang="en">Set the default collation (deprecated option, use instead).
-      --default-collation=name</shortdescription>
+        --default-collation=name</shortdescription>
     <seealso xref="collation_server"/>
     <types>
       <optype class="cmdline" format="--character-set-server" setvar="character_set_server"/>

@@ -3702,12 +3734,12 @@
       <vartype isdynamic="yes" scope="both" class="system" format="competion_type"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
       <choice value="0"/>
       <choice value="1"/>
       <choice value="2"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -3727,17 +3759,17 @@
       <vartype class="system" format="concurrent_insert" isdynamic="yes" scope="global"/>
     </types>
     <values vartype="boolean" platform="all" outversion="5.0.6">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <values vartype="numeric" platform="all" inversion="5.0.6">
-
+  
       <value default="1"/>
       <choice value="0"/>
       <choice value="1"/>
       <choice value="2"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -3750,16 +3782,16 @@
     <xrefto id="option_mysqld_connect_timeout"/>
     <name>connect_timeout</name>
     <shortdescription lang="en">The number of seconds the mysqld server waits for a connect packet
-      before responding with 'Bad handshake'</shortdescription>
+        before responding with 'Bad handshake'</shortdescription>
     <types>
       <optype class="cmdline" format="--connect_timeout=#" setvar="connect_timeout"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" format="connect_timeout" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="5"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -3772,7 +3804,7 @@
     <xrefto id="option_mysqld_console"/>
     <name>console</name>
     <shortdescription lang="en">Write error output on screen; do not remove the console window on
-      Windows</shortdescription>
+        Windows</shortdescription>
     <platforms applies="windows"/>
     <types>
       <optype class="cmdline" format="--console" setvar="console"/>

@@ -3794,9 +3826,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -3806,7 +3838,7 @@
     </versions>
   </option>
   <option command="mysqld" section="innodb" id="crash_binlog_innodb">
-<!--    <xrefto id="option_mysqld_crash_binlog_innodb"/> -->
+  <!--    <xrefto id="option_mysqld_crash_binlog_innodb"/> -->
     <name>crash_binlog_innodb</name>
     <shortdescription lang="en">Used only for testing, to crash when writing Nth event to binlog</shortdescription>
     <types>

@@ -3896,7 +3928,7 @@
     <deprecated version="4.1.1"/>
     <types>
       <optype class="cmdline" format="--character_set=name" setvar="character_set"
-        outversion="4.1.1"/>
+          outversion="4.1.1"/>
       <vartype  isdynamic="no" class="system" outversion="4.1.1"/>
     </types>
     <values vartype="string" platform="all"/>

@@ -3980,9 +4012,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -3992,7 +4024,7 @@
     </versions>
   </option>
   <option command="mysqld" section="server" id="defaults-extra-file">
-<!-- this is actually a general option -->
+  <!-- this is actually a general option -->
     <xrefto id="option_defaults-extra-file"/>
     <name>defaults-extra-file</name>
     <shortdescription lang="en">Load additional options from file</shortdescription>

@@ -4008,7 +4040,7 @@
     </versions>
   </option>
   <option command="mysqld" section="server" id="defaults-group-suffix">
-<!-- this is actually a general option -->
+  <!-- this is actually a general option -->
     <xrefto id="option_defaults-group-suffix"/>
     <name>defaults-group-suffix</name>
     <shortdescription lang="en">Option group suffix value</shortdescription>

@@ -4024,7 +4056,7 @@
     </versions>
   </option>
   <option command="mysqld" section="server" id="defaults-file">
-<!-- this is actually a general option -->
+  <!-- this is actually a general option -->
     <xrefto id="option_defaults-file"/>
     <name>defaults-file</name>
     <shortdescription lang="en">Loads defaults from specific file</shortdescription>

@@ -4049,12 +4081,12 @@
       <vartype class="system" isdynamic="yes" scope="global"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <value default="ON"/>
       <choice value="ON"/>
       <choice value="OFF"/>
       <choice value="ALL"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4076,17 +4108,17 @@
     <xrefto id="option_mysqld_delayed_insert_limit"/>
     <name>delayed_insert_limit</name>
     <shortdescription lang="en">After inserting delayed_insert_limit rows, the INSERT DELAYED
-      handler will check if there are any SELECT statements pending. If so, it allows these to
-      execute before continuing</shortdescription>
+        handler will check if there are any SELECT statements pending. If so, it allows these to
+        execute before continuing</shortdescription>
     <types>
       <optype class="cmdline" format="--delayed_insert_limit=#" setvar="delayed_insert_limit"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="100"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4099,16 +4131,16 @@
     <xrefto id="option_mysqld_delayed_insert_timeout"/>
     <name>delayed_insert_timeout</name>
     <shortdescription lang="en">How many seconds an INSERT DELAYED thread should wait for INSERT
-      statements before terminating</shortdescription>
+        statements before terminating</shortdescription>
     <types>
       <optype class="cmdline" format="--delayed_insert_timeout=#" setvar="delayed_insert_timeout"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="300"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4121,16 +4153,16 @@
     <xrefto id="option_mysqld_delayed_queue_size"/>
     <name>delayed_queue_size</name>
     <shortdescription lang="en">What size queue (in rows) should be allocated for handling INSERT
-      DELAYED</shortdescription>
+        DELAYED</shortdescription>
     <types>
       <optype class="cmdline" format="--delayed_queue_size=#" setvar="delayed_queue_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1000"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4161,13 +4193,13 @@
     <shortdescription lang="en">Option used by mysql-test for debugging and testing of replication</shortdescription>
     <types>
       <optype class="cmdline" format="--disconnect-slave-event-count=#"
-        setvar="disconnect-slave-event-count"/>
+          setvar="disconnect-slave-event-count"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4180,16 +4212,16 @@
     <xrefto id="option_mysqld_div_precision_increment"/>
     <name>div_precision_increment</name>
     <shortdescription lang="en">Scale of the result of '/' operator will be
-increased by this many digits</shortdescription>
+  increased by this many digits</shortdescription>
     <types>
       <optype class="cmdline" format="--div_precision_increment=#" setvar="div_precision_increment"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="4"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -4209,9 +4241,9 @@
       <optype class="cmdline" format="--enable-locking" setvar="enable-locking"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4229,9 +4261,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4245,14 +4277,14 @@
     <shortdescription lang="en">Push supported query conditions to the storage engine</shortdescription>
     <types>
       <optype class="cmdline" format="--engine-condition-pushdown"
-        setvar="engine_condition_pushdown"/>
+          setvar="engine_condition_pushdown"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="both" format="engine-condition-pushdown" isdynamic="yes"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="OFF"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -4279,20 +4311,20 @@
     <xrefto id="option_mysqld_event-scheduler"/>
     <name>event-scheduler</name>
     <shortdescription lang="en">Enable/disable and start/stop the event scheduler. Note that this
-      variable underwent significant changes in behavior and permitted values in MySQL 5.1.11 and
-      5.1.12</shortdescription>
+        variable underwent significant changes in behavior and permitted values in MySQL 5.1.11 and
+        5.1.12</shortdescription>
     <types>
       <optype class="cmdline" format="--event-scheduler=#" setvar="event_scheduler"/>
       <optype class="mycnf"/>
       <vartype class="system"  isdynamic="no"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <value default="OFF"/>
       <choice value="ON"/>
       <choice value="OFF"/>
       <choice value="DISABLED"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -4321,16 +4353,16 @@
     <xrefto id="option_mysqld_expire_logs_days"/>
     <name>expire_logs_days</name>
     <shortdescription lang="en">If non-zero, binary logs will be purged after expire_logs_days days;
-      possible purges happen at startup and at binary log rotation</shortdescription>
+        possible purges happen at startup and at binary log rotation</shortdescription>
     <types>
       <optype class="cmdline" format="--expire_logs_days=#" setvar="expire_logs_days"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4351,9 +4383,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4372,9 +4404,9 @@
       <vartype class="system" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="OFF"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4387,16 +4419,16 @@
     <xrefto id="option_mysqld_flush_time"/>
     <name>flush_time</name>
     <shortdescription lang="en">A dedicated thread is created to flush all tables at the given
-      interval</shortdescription>
+        interval</shortdescription>
     <types>
       <optype class="cmdline" format="--flush_time=#" setvar="flush_time"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4408,15 +4440,15 @@
   <option command="mysqld" section="innodb" id="foreign_key_checks">
     <name>foreign_key_checks</name>
     <shortdescription lang="en">If set to 1 (the default), foreign key constraints for InnoDB tables
-      are checked.</shortdescription>
+        are checked.</shortdescription>
     <types>
       <optype class="cmdline" format="--foreign_key_checks"/>
       <vartype class="system" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4435,9 +4467,9 @@
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="string" platform="all">
-
+  
       <value default="+-&gt;&lt;()~*:&quot;&quot;&amp;"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4450,7 +4482,7 @@
     <xrefto id="option_mysqld_ft_max_word_len"/>
     <name>ft_max_word_len</name>
     <shortdescription lang="en">The maximum length of the word to be included in a FULLTEXT index.
-      Note: FULLTEXT indexes must be rebuilt after changing this variable</shortdescription>
+        Note: FULLTEXT indexes must be rebuilt after changing this variable</shortdescription>
     <types>
       <optype class="cmdline" format="--ft_max_word_len=#" setvar="ft_max_word_len"/>
       <optype class="mycnf"/>

@@ -4468,16 +4500,16 @@
     <xrefto id="option_mysqld_ft_min_word_len"/>
     <name>ft_min_word_len</name>
     <shortdescription lang="en">The minimum length of the word to be included in a FULLTEXT index.
-      Note: FULLTEXT indexes must be rebuilt after changing this variable</shortdescription>
+        Note: FULLTEXT indexes must be rebuilt after changing this variable</shortdescription>
     <types>
       <optype class="cmdline" format="--ft_min_word_len=#" setvar="ft_min_word_len"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="4"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4492,14 +4524,14 @@
     <shortdescription lang="en">Number of best matches to use for query expansion</shortdescription>
     <types>
       <optype class="cmdline" format="--ft_query_expansion_limit=#"
-        setvar="ft_query_expansion_limit"/>
+          setvar="ft_query_expansion_limit"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="20"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4536,9 +4568,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4570,9 +4602,9 @@
       <vartype isdynamic="no" class="system" scope="global"/>
     </types>
     <values vartype="filename" platform="all">
-
+  
       <value default="host_name.log"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -4590,9 +4622,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1024"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4621,10 +4653,10 @@
     </versions>
   </option>
   <option command="mysqld" section="server" id="identity">
-<!--xrefto id="option_mysqld_last_insert_id"/-->
+  <!--xrefto id="option_mysqld_last_insert_id"/-->
     <name>identity</name>
     <shortdescription lang="en">This variable is a synonym for the LAST_INSERT_ID variable. It
-      exists for compatibility with other database systems</shortdescription>
+        exists for compatibility with other database systems</shortdescription>
     <seealso xref="last_insert_id"/>
     <types>
       <optype class="cmdline" format="--identity=N"/>

@@ -4689,22 +4721,22 @@
       <manual version="5.2"/>
     </versions>
   </option>
-<!--option command="mysqld" section="server" id="init-rpl-role">
-    <name>init-rpl-role</name>
-    <shortdescription lang="en">Set the replication role</shortdescription>
-    <types>
-      <optype class="cmdline" format="&ndash;&ndash;init-rpl-role=name"/>
-      <optype class="mycnf"/>
-    </types>
-    <values vartype="string" platform="all"/>
-    <versions>
-      <manual version="4.1"/>
-      <manual version="5.0"/>
-      <manual version="5.1"/>
-      <manual version="5.2"/>
-    </versions>
-  </option-->
-  <option command="mysqld" section="replication" id="init_slave">
+  
+  <!--option command="mysqld" section="server" id="init-rpl-role">
+      <name>init-rpl-role</name>
+      <shortdescription lang="en">Set the replication role</shortdescription>
+      <types>
+        <optype class="cmdline" format="&ndash;&ndash;init-rpl-role=name"/>
+        <optype class="mycnf"/>
+      </types>
+      <values vartype="string" platform="all"/>
+      <versions>
+        <manual version="4.1"/>
+        <manual version="5.0"/>
+        <manual version="5.1"/>
+        <manual version="5.2"/>
+      </versions>
+    </option--><option command="mysqld" section="replication" id="init_slave">
     <name>init_slave</name>
     <shortdescription lang="en">Command(s) that are executed when a slave connects to a master</shortdescription>
     <types>

@@ -4756,10 +4788,10 @@
     <xrefto id="option_mysqld_innodb_additional_mem_pool_size"/>
     <name>innodb_additional_mem_pool_size</name>
     <shortdescription lang="en">Size of a memory pool InnoDB uses to store data dictionary
-      information and other internal data structures</shortdescription>
+        information and other internal data structures</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_additional_mem_pool_size=#"
-        setvar="innodb_additional_mem_pool_size"/>
+          setvar="innodb_additional_mem_pool_size"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>

@@ -4775,10 +4807,10 @@
     <xrefto id="option_mysqld_plugin_innodb_additional_mem_pool_size"/>
     <name>plugin_innodb_additional_mem_pool_size</name>
     <shortdescription lang="en">Size of a memory pool InnoDB uses to store data dictionary
-      information and other internal data structures</shortdescription>
+        information and other internal data structures</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_additional_mem_pool_size=#"
-        setvar="plugin_innodb_additional_mem_pool_size"/>
+          setvar="plugin_innodb_additional_mem_pool_size"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>

@@ -4795,14 +4827,14 @@
     <shortdescription lang="en">Data file autoextend increment in megabytes</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_autoextend_increment=#"
-        setvar="innodb_autoextend_increment"/>
+          setvar="innodb_autoextend_increment"/>
       <optype class="mycnf"/>
       <vartype class="system" isdynamic="yes" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="8"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4818,14 +4850,14 @@
     <shortdescription lang="en">Data file autoextend increment in megabytes</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_autoextend_increment=#"
-        setvar="plugin_innodb_autoextend_increment"/>
+          setvar="plugin_innodb_autoextend_increment"/>
       <optype class="mycnf"/>
       <vartype class="system" isdynamic="yes" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="8"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -4843,9 +4875,9 @@
       <vartype isdynamic="yes" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -4857,18 +4889,18 @@
     <xrefto id="option_mysqld_innodb_buffer_pool_awe_mem_mb"/>
     <name>innodb_buffer_pool_awe_mem_mb</name>
     <shortdescription lang="en">If Windows AWE is used, the size in Megabytes of InnoDB buffer pool
-      allocated from the AWE memory</shortdescription>
+        allocated from the AWE memory</shortdescription>
     <platforms applies="windows"/>
     <types>
       <optype class="cmdline" format="--innodb_buffer_pool_awe_mem_mb=#"
-        setvar="innodb_buffer_pool_awe_mem_mb"/>
+          setvar="innodb_buffer_pool_awe_mem_mb"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>
     <values vartype="numeric" platform="windows">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4882,18 +4914,18 @@
     <xrefto id="option_mysqld_innodb_buffer_pool_awe_mem_mb"/>
     <name>plugin_innodb_buffer_pool_awe_mem_mb</name>
     <shortdescription lang="en">If Windows AWE is used, the size in Megabytes of InnoDB buffer pool
-      allocated from the AWE memory</shortdescription>
+        allocated from the AWE memory</shortdescription>
     <platforms applies="windows"/>
     <types>
       <optype class="cmdline" format="--plugin_innodb_buffer_pool_awe_mem_mb=#"
-        setvar="innodb_buffer_pool_awe_mem_mb"/>
+          setvar="innodb_buffer_pool_awe_mem_mb"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>
     <values vartype="numeric" platform="windows">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -4905,7 +4937,7 @@
     <xrefto id="option_mysqld_innodb_buffer_pool_size"/>
     <name>innodb_buffer_pool_size</name>
     <shortdescription lang="en">The size of the memory buffer InnoDB uses to cache data and indexes
-      of its tables</shortdescription>
+        of its tables</shortdescription>
     <platforms applies="windows"/>
     <types>
       <optype class="cmdline" format="--innodb_buffer_pool_size=#" setvar="innodb_buffer_pool_size"/>

@@ -4913,9 +4945,9 @@
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>
     <values vartype="numeric" platform="windows">
-
+  
       <value default="8388608"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -4928,18 +4960,18 @@
     <xrefto id="option_mysqld_plugin_innodb_buffer_pool_size"/>
     <name>plugin_innodb_buffer_pool_size</name>
     <shortdescription lang="en">The size of the memory buffer InnoDB uses to cache data and indexes
-      of its tables</shortdescription>
+        of its tables</shortdescription>
     <platforms applies="windows"/>
     <types>
       <optype class="cmdline" format="--plugin_innodb_buffer_pool_size=#"
-        setvar="plugin_innodb_buffer_pool_size"/>
+          setvar="plugin_innodb_buffer_pool_size"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="both" isdynamic="no"/>
     </types>
     <values vartype="numeric" platform="windows">
-
+  
       <value default="8388608"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -4958,9 +4990,9 @@
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="ON"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -4980,9 +5012,9 @@
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="ON"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -4994,7 +5026,7 @@
     <xrefto id="option_mysqld_innodb-safe-binlog"/>
     <name>innodb-safe-binlog</name>
     <shortdescription lang="en">Adds consistency guarantees between the content of InnoDB tables and
-      the binary log </shortdescription>
+        the binary log </shortdescription>
     <deprecated version="5.0.3"/>
     <types>
       <optype class="cmdline" format="--innodb-safe-binlog" setvar="innodb-safe-binlog"/>

@@ -5012,7 +5044,7 @@
     <shortdescription lang="en">Helps in performance tuning in heavily concurrent environments</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_commit_concurrency=#"
-        setvar="innodb_commit_concurrency"/>
+          setvar="innodb_commit_concurrency"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="yes"/>
     </types>

@@ -5030,7 +5062,7 @@
     <shortdescription lang="en">Helps in performance tuning in heavily concurrent environments</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_commit_concurrency=#"
-        setvar="plugin_innodb_commit_concurrency"/>
+          setvar="plugin_innodb_commit_concurrency"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="yes"/>
     </types>

@@ -5045,17 +5077,17 @@
     <xrefto id="option_mysqld_innodb_concurrency_tickets"/>
     <name>innodb_concurrency_tickets</name>
     <shortdescription lang="en">Number of times a thread is allowed to enter InnoDB within the same
-      SQL query after it has once got the ticket </shortdescription>
+        SQL query after it has once got the ticket </shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_concurrency_tickets=#"
-        setvar="innodb_concurrency_tickets"/>
+          setvar="innodb_concurrency_tickets"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="yes"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="500"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -5068,17 +5100,17 @@
     <xrefto id="option_mysqld_plugin_innodb_concurrency_tickets"/>
     <name>plugin_innodb_concurrency_tickets</name>
     <shortdescription lang="en">Number of times a thread is allowed to enter InnoDB within the same
-      SQL query after it has once got the ticket</shortdescription>
+        SQL query after it has once got the ticket</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_concurrency_tickets=#"
-        setvar="plugin_innodb_concurrency_tickets"/>
+          setvar="plugin_innodb_concurrency_tickets"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="yes"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="500"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5146,7 +5178,7 @@
     <seealso xref="plugin_innodb_data_file_path"/>
     <types>
       <optype class="cmdline" format="--plugin_innodb_data_home_dir=name"
-        setvar="plugin_innodb_data_home_dir"/>
+          setvar="plugin_innodb_data_home_dir"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>

@@ -5179,7 +5211,7 @@
     <shortdescription lang="en">Enable InnoDB doublewrite buffer</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin-innodb-doublewrite"
-        setvar="plugin_innodb_doublewrite"/>
+          setvar="plugin_innodb_doublewrite"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>

@@ -5199,12 +5231,12 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
       <choice value="0"/>
       <choice value="1"/>
       <choice value="2"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5219,17 +5251,17 @@
     <shortdescription lang="en">Speeds up the shutdown process of the InnoDB storage engine</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_fast_shutdown[=#]"
-        setvar="plugin_innodb_fast_shutdown"/>
+          setvar="plugin_innodb_fast_shutdown"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
       <choice value="0"/>
       <choice value="1"/>
       <choice value="2"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5247,9 +5279,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="4"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5264,14 +5296,14 @@
     <shortdescription lang="en">Number of file I/O threads in InnoDB</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_file_io_threads=#"
-        setvar="plugin_innodb_file_io_threads"/>
+          setvar="plugin_innodb_file_io_threads"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="4"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5302,7 +5334,7 @@
     <shortdescription lang="en">Stores each InnoDB table to an .ibd file in the database dir</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_file_per_table"
-        setvar="plugin_innodb_file_per_table"/>
+          setvar="plugin_innodb_file_per_table"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>

@@ -5316,20 +5348,20 @@
     <xrefto id="option_mysqld_innodb_flush_log_at_trx_commit"/>
     <name>innodb_flush_log_at_trx_commit</name>
     <shortdescription lang="en">Set to 0 (write and flush once per second), 1 (write and flush at
-      each commit) or 2 (write at commit, flush once per second)</shortdescription>
+        each commit) or 2 (write at commit, flush once per second)</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_flush_log_at_trx_commit[=#]"
-        setvar="innodb_flush_log_at_trx_commit"/>
+          setvar="innodb_flush_log_at_trx_commit"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
       <choice value="0"/>
       <choice value="1"/>
       <choice value="2"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5342,20 +5374,20 @@
     <xrefto id="option_mysqld_plugin_innodb_flush_log_at_trx_commit"/>
     <name>plugin_innodb_flush_log_at_trx_commit</name>
     <shortdescription lang="en">Set to 0 (write and flush once per second), 1 (write and flush at
-      each commit) or 2 (write at commit, flush once per second)</shortdescription>
+        each commit) or 2 (write at commit, flush once per second)</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_flush_log_at_trx_commit[=#]"
-        setvar="plugin_innodb_flush_log_at_trx_commit"/>
+          setvar="plugin_innodb_flush_log_at_trx_commit"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
       <choice value="0"/>
       <choice value="1"/>
       <choice value="2"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5373,33 +5405,33 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="enumeration" platform="windows">
-
+  
       <value default="async_unbuffered"/>
-
+  
     </values>
     <values vartype="enumeration" platform="linux">
-
+  
       <value default="fdatasync"/>
       <choice value="fdatasync"/>
       <choice value="O_DSYNC"/>
       <choice value="O_DIRECT"/>
-
+  
     </values>
     <values vartype="enumeration" platform="hpux">
-
+  
       <value default="fdatasync"/>
       <choice value="fdatasync"/>
       <choice value="O_DSYNC"/>
       <choice value="O_DIRECT"/>
-
+  
     </values>
     <values vartype="enumeration" platform="solaris">
-
+  
       <value default="fdatasync"/>
       <choice value="fdatasync"/>
       <choice value="O_DSYNC"/>
       <choice value="O_DIRECT"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5414,38 +5446,38 @@
     <shortdescription lang="en">With which method to flush data</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_flush_method=name"
-        setvar="plugin_innodb_flush_method"/>
+          setvar="plugin_innodb_flush_method"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="enumeration" platform="windows">
-
+  
       <value default="async_unbuffered"/>
-
+  
     </values>
     <values vartype="enumeration" platform="linux">
-
+  
       <value default="fdatasync"/>
       <choice value="fdatasync"/>
       <choice value="O_DSYNC"/>
       <choice value="O_DIRECT"/>
-
+  
     </values>
     <values vartype="enumeration" platform="hpux">
-
+  
       <value default="fdatasync"/>
       <choice value="fdatasync"/>
       <choice value="O_DSYNC"/>
       <choice value="O_DIRECT"/>
-
+  
     </values>
     <values vartype="enumeration" platform="solaris">
-
+  
       <value default="fdatasync"/>
       <choice value="fdatasync"/>
       <choice value="O_DSYNC"/>
       <choice value="O_DIRECT"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5457,14 +5489,14 @@
     <xrefto id="option_mysqld_innodb_force_recovery"/>
     <name>innodb_force_recovery</name>
     <shortdescription lang="en">Helps to save your data in case the disk image of the database
-      becomes corrupt</shortdescription>
+        becomes corrupt</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_force_recovery=#" setvar="innodb_force_recovery"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <value default="0"/>
       <choice value="0"/>
       <choice value="SRV_FORCE_IGNORE_CORRUPT"/>

@@ -5473,7 +5505,7 @@
       <choice value="SRV_FORCE_NO_IBUF_MERGE"/>
       <choice value="SRV_FORCE_NO_UNDO_LOG_SCAN"/>
       <choice value="SRV_FORCE_NO_LOG_REDO"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5486,15 +5518,15 @@
     <xrefto id="option_mysqld_plugin_innodb_force_recovery"/>
     <name>plugin_innodb_force_recovery</name>
     <shortdescription lang="en">Helps to save your data in case the disk image of the database
-      becomes corrupt</shortdescription>
+        becomes corrupt</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_force_recovery=#"
-        setvar="plugin_innodb_force_recovery"/>
+          setvar="plugin_innodb_force_recovery"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <value default="0"/>
       <choice value="0"/>
       <choice value="SRV_FORCE_IGNORE_CORRUPT"/>

@@ -5503,7 +5535,7 @@
       <choice value="SRV_FORCE_NO_IBUF_MERGE"/>
       <choice value="SRV_FORCE_NO_UNDO_LOG_SCAN"/>
       <choice value="SRV_FORCE_NO_LOG_REDO"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5515,17 +5547,17 @@
     <xrefto id="option_mysqld_innodb_lock_wait_timeout"/>
     <name>innodb_lock_wait_timeout</name>
     <shortdescription lang="en">Timeout in seconds an InnoDB transaction may wait for a lock before
-      being rolled back</shortdescription>
+        being rolled back</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_lock_wait_timeout=#"
-        setvar="innodb_lock_wait_timeout"/>
+          setvar="innodb_lock_wait_timeout"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="50"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5538,17 +5570,17 @@
     <xrefto id="option_mysqld_plugin_innodb_lock_wait_timeout"/>
     <name>plugin_innodb_lock_wait_timeout</name>
     <shortdescription lang="en">Timeout in seconds an InnoDB transaction may wait for a lock before
-      being rolled back</shortdescription>
+        being rolled back</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_lock_wait_timeout=#"
-        setvar="plugin_innodb_lock_wait_timeout"/>
+          setvar="plugin_innodb_lock_wait_timeout"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="50"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5560,17 +5592,17 @@
     <xrefto id="option_mysqld_innodb_locks_unsafe_for_binlog"/>
     <name>innodb_locks_unsafe_for_binlog</name>
     <shortdescription lang="en">Force InnoDB not to use next-key locking. Instead use only row-level
-      locking</shortdescription>
+        locking</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_locks_unsafe_for_binlog"
-        setvar="innodb_locks_unsafe_for_binlog"/>
+          setvar="innodb_locks_unsafe_for_binlog"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5584,17 +5616,17 @@
     <xrefto id="option_mysqld_plugin_innodb_locks_unsafe_for_binlog"/>
     <name>plugin_innodb_locks_unsafe_for_binlog</name>
     <shortdescription lang="en">Force InnoDB not to use next-key locking. Instead use only row-level
-      locking</shortdescription>
+        locking</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_locks_unsafe_for_binlog"
-        setvar="plugin_innodb_locks_unsafe_for_binlog"/>
+          setvar="plugin_innodb_locks_unsafe_for_binlog"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5629,9 +5661,9 @@
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5650,9 +5682,9 @@
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5664,16 +5696,16 @@
     <xrefto id="option_mysqld_innodb_log_buffer_size"/>
     <name>innodb_log_buffer_size</name>
     <shortdescription lang="en">The size of the buffer which InnoDB uses to write log to the log
-      files on disk</shortdescription>
+        files on disk</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_log_buffer_size=#" setvar="innodb_log_buffer_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1048576"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5686,17 +5718,17 @@
     <xrefto id="option_mysqld_plugin_innodb_log_buffer_size"/>
     <name>plugin_innodb_log_buffer_size</name>
     <shortdescription lang="en">The size of the buffer which InnoDB uses to write log to the log
-      files on disk</shortdescription>
+        files on disk</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_log_buffer_size=#"
-        setvar="plugin_innodb_log_buffer_size"/>
+          setvar="plugin_innodb_log_buffer_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1048576"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5714,9 +5746,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="5242880"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5731,14 +5763,14 @@
     <shortdescription lang="en">Size of each log file in a log group </shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_log_file_size=#"
-        setvar="plugin_innodb_log_file_size"/>
+          setvar="plugin_innodb_log_file_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="5242880"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5750,17 +5782,17 @@
     <xrefto id="option_mysqld_innodb_log_files_in_group"/>
     <name>innodb_log_files_in_group</name>
     <shortdescription lang="en">Number of log files in the log group. InnoDB writes to the files in
-      a circular fashion. Value 3 is recommended here </shortdescription>
+        a circular fashion. Value 3 is recommended here </shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_log_files_in_group=#"
-        setvar="innodb_log_files_in_group"/>
+          setvar="innodb_log_files_in_group"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="2"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5773,17 +5805,17 @@
     <xrefto id="option_mysqld_plugin_innodb_log_files_in_group"/>
     <name>plugin_innodb_log_files_in_group</name>
     <shortdescription lang="en">Number of log files in the log group. InnoDB writes to the files in
-      a circular fashion. Value 3 is recommended here </shortdescription>
+        a circular fashion. Value 3 is recommended here </shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_log_files_in_group=#"
-        setvar="plugin_innodb_log_files_in_group"/>
+          setvar="plugin_innodb_log_files_in_group"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="2"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5797,7 +5829,7 @@
     <shortdescription lang="en">Path to InnoDB log files</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_log_group_home_dir=name"
-        setvar="innodb_log_group_home_dir"/>
+          setvar="innodb_log_group_home_dir"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>

@@ -5815,7 +5847,7 @@
     <shortdescription lang="en">Path to InnoDB log files</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_log_group_home_dir=name"
-        setvar="plugin_innodb_log_group_home_dir"/>
+          setvar="plugin_innodb_log_group_home_dir"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>

@@ -5832,14 +5864,14 @@
     <shortdescription lang="en">Percentage of dirty pages allowed in bufferpool </shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_max_dirty_pages_pct=#"
-        setvar="innodb_max_dirty_pages_pct"/>
+          setvar="innodb_max_dirty_pages_pct"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="90" maximum="100" minimum="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5854,14 +5886,14 @@
     <shortdescription lang="en">Percentage of dirty pages allowed in bufferpool </shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_max_dirty_pages_pct=#"
-        setvar="plugin_innodb_max_dirty_pages_pct"/>
+          setvar="plugin_innodb_max_dirty_pages_pct"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="90" maximum="100" minimum="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5879,9 +5911,9 @@
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5897,14 +5929,14 @@
     <shortdescription lang="en">Desired maximum length of the purge queue (0 = no limit) </shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_max_purge_lag=#"
-        setvar="plugin_innodb_max_purge_lag"/>
+          setvar="plugin_innodb_max_purge_lag"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5918,14 +5950,14 @@
     <shortdescription lang="en">Number of identical copies of log groups we keep for the database</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_mirrored_log_groups=#"
-        setvar="innodb_mirrored_log_groups"/>
+          setvar="innodb_mirrored_log_groups"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5940,14 +5972,14 @@
     <shortdescription lang="en">Number of identical copies of log groups we keep for the database</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_mirrored_log_groups=#"
-        setvar="plugin_innodb_mirrored_log_groups"/>
+          setvar="plugin_innodb_mirrored_log_groups"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -5965,9 +5997,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="300" minimum="10"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -5983,14 +6015,14 @@
     <shortdescription lang="en">The maximum number of files that InnoDB keeps open at the same time</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_open_files=#"
-        setvar="plugin_innodb_open_files"/>
+          setvar="plugin_innodb_open_files"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="300" minimum="10"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -6002,10 +6034,10 @@
     <xrefto id="option_mysqld_innodb_rollback_on_timeout"/>
     <name>innodb_rollback_on_timeout</name>
     <shortdescription lang="en">Roll back entire transaction on transaction timeout, not just last
-      statement</shortdescription>
+        statement</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_rollback_on_timeout"
-        setvar="innodb_rollback_on_timeout"/>
+          setvar="innodb_rollback_on_timeout"/>
       <optype class="mycnf"/>
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>

@@ -6021,10 +6053,10 @@
     <xrefto id="option_mysqld_plugin_innodb_rollback_on_timeout"/>
     <name>plugin_innodb_rollback_on_timeout</name>
     <shortdescription lang="en">Roll back entire transaction on transaction timeout, not just last
-      statement</shortdescription>
+        statement</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_rollback_on_timeout"
-        setvar="plugin_innodb_rollback_on_timeout"/>
+          setvar="plugin_innodb_rollback_on_timeout"/>
       <optype class="mycnf"/>
       <vartype class="system" isdynamic="no"/>
     </types>

@@ -6035,19 +6067,19 @@
     </versions>
   </option>
   <option command="mysqld" section="innodb" id="innodb_stats_on_metadata">
-<!--    <xrefto id="option_mysqld_innodb_stats_on_metadata"/> -->
+  <!--    <xrefto id="option_mysqld_innodb_stats_on_metadata"/> -->
     <name>innodb_stats_on_metadata</name>
     <shortdescription lang="en"> Enable or disable InnoDB table statistics updates for metadata
-      statements </shortdescription>
+        statements </shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_stats_on_metadata" setvar="innodb_stats_on_metadata"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="ON"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -6058,17 +6090,17 @@
   <option command="mysqld" section="innodb" id="plugin_innodb_stats_on_metadata">
     <name>plugin_innodb_stats_on_metadata</name>
     <shortdescription lang="en">Enable or disable InnoDB table statistics updates for metadata
-      statements</shortdescription>
+        statements</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_stats_on_metadata"
-        setvar="plugin_innodb_stats_on_metadata"/>
+          setvar="plugin_innodb_stats_on_metadata"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="ON"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -6086,9 +6118,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6107,9 +6139,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -6128,9 +6160,9 @@
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="20"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -6149,9 +6181,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6165,18 +6197,18 @@
     <xrefto id="option_mysqld_innodb_thread_concurrency"/>
     <name>innodb_thread_concurrency</name>
     <shortdescription lang="en">Sets the maximum number of threads allowed inside InnoDB. Value 0
-      will disable the thread throttling</shortdescription>
+        will disable the thread throttling</shortdescription>
     <seealso xref="innodb_concurrency_tickets"/>
     <types>
       <optype class="cmdline" format="--innodb_thread_concurrency=#"
-        setvar="innodb_thread_concurrency"/>
+          setvar="innodb_thread_concurrency"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="8"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6189,27 +6221,27 @@
     <xrefto id="option_mysqld_innodb_thread_sleep_delay"/>
     <name>innodb_thread_sleep_delay</name>
     <shortdescription lang="en">Time of innodb thread sleeping before joining InnoDB queue (usec).
-      Value 0 disable a sleep</shortdescription>
+        Value 0 disable a sleep</shortdescription>
     <types>
       <optype class="cmdline" format="--innodb_thread_sleep_delay=#"
-        setvar="innodb_thread_sleep_delay"/>
+          setvar="innodb_thread_sleep_delay"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all" inversion="5.0.8" outversion="5.0.18">
-
+  
       <value default="20"/>
-
+  
     </values>
     <values vartype="numeric" platform="all" inversion="5.0.19" outversion="5.0.20">
-
+  
       <value default="0" minimum="0" maximum="1000"/>
-
+  
     </values>
     <values vartype="numeric" platform="all" inversion="5.0.21">
-
+  
       <value default="8"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -6224,14 +6256,14 @@
     <shortdescription lang="en">Enable SHOW INNODB STATUS output in the innodb_status.[pid] file</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_status_file"
-        setvar="plugin_innodb_status_file"/>
+          setvar="plugin_innodb_status_file"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -6249,9 +6281,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -6265,14 +6297,14 @@
     <shortdescription lang="en">Count of spin-loop rounds in InnoDB mutexes</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_sync_spin_loops=#"
-        setvar="innodb_sync_spin_loops"/>
+          setvar="innodb_sync_spin_loops"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="20"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -6286,14 +6318,14 @@
     <shortdescription lang="en">Enable InnoDB locking in LOCK TABLES</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_table_locks"
-        setvar="plugin_innodb_table_locks"/>
+          setvar="plugin_innodb_table_locks"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -6305,18 +6337,18 @@
     <xrefto id="option_mysqld_plugin_innodb_thread_concurrency"/>
     <name>innodb_thread_concurrency</name>
     <shortdescription lang="en">Sets the maximum number of threads allowed inside InnoDB. Value 0
-      will disable the thread throttling</shortdescription>
+        will disable the thread throttling</shortdescription>
     <seealso xref="plugin_innodb_concurrency_tickets"/>
     <types>
       <optype class="cmdline" format="--plugin_innodb_thread_concurrency=#"
-        setvar="plugin_innodb_thread_concurrency"/>
+          setvar="plugin_innodb_thread_concurrency"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="8"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -6328,17 +6360,17 @@
     <xrefto id="option_mysqld_plugin_innodb_thread_sleep_delay"/>
     <name>plugin_innodb_thread_sleep_delay</name>
     <shortdescription lang="en">Time of innodb thread sleeping before joining InnoDB queue (usec).
-      Value 0 disable a sleep</shortdescription>
+        Value 0 disable a sleep</shortdescription>
     <types>
       <optype class="cmdline" format="--plugin_innodb_thread_sleep_delay=#"
-        setvar="plugin_innodb_thread_sleep_delay"/>
+          setvar="plugin_innodb_thread_sleep_delay"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="8"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -6349,7 +6381,7 @@
   <option command="mysqld" section="server" id="insert_id">
     <name>insert_id</name>
     <shortdescription lang="en">Set the value to be used by the following INSERT or ALTER TABLE
-      statement when inserting an AUTO_INCREMENT value</shortdescription>
+        statement when inserting an AUTO_INCREMENT value</shortdescription>
     <types>
       <optype class="cmdline" format="--insert_id"/>
       <optype class="mycnf"/>

@@ -6367,16 +6399,16 @@
     <xrefto id="option_mysqld_interactive_timeout"/>
     <name>interactive_timeout</name>
     <shortdescription lang="en">The number of seconds the server waits for activity on an
-      interactive connection before closing it</shortdescription>
+        interactive connection before closing it</shortdescription>
     <types>
       <optype class="cmdline" format="--interactive_timeout=#" setvar="interactive_timeout"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="28800"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6395,9 +6427,9 @@
       <vartype isdynamic="no" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6413,9 +6445,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="131072"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6428,16 +6460,16 @@
     <xrefto id="option_mysqld_keep_files_on_create"/>
     <name>keep_files_on_create</name>
     <shortdescription lang="en">Do not overwrite existing .MYD/.MYI files in
-default database directory</shortdescription>
+  default database directory</shortdescription>
     <types>
       <optype class="cmdline" format="--keep_files_on_create=#" setvar="keep_files_on_create"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="OFF"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -6457,9 +6489,9 @@
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="8388600"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6472,18 +6504,18 @@
     <xrefto id="option_mysqld_key_cache_age_threshold"/>
     <name>key_cache_age_threshold</name>
     <shortdescription lang="en">This characterizes the number of hits a hot block has to be
-      untouched until it is considered aged enough to be downgraded to a warm block. This specifies
-      the percentage ratio of that number of hits to the total number of blocks in key cache</shortdescription>
+        untouched until it is considered aged enough to be downgraded to a warm block. This specifies
+        the percentage ratio of that number of hits to the total number of blocks in key cache</shortdescription>
     <types>
       <optype class="cmdline" format="--key_cache_age_threshold=#" setvar="key_cache_age_threshold"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value minimum="100"/>
       <value default="300"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6503,9 +6535,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1024"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6521,16 +6553,16 @@
     <shortdescription lang="en">The minimum percentage of warm blocks in key cache</shortdescription>
     <types>
       <optype class="cmdline" format="--key_cache_division_limit=#"
-        setvar="key_cache_division_limit"/>
+          setvar="key_cache_division_limit"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="100"/>
       <value minimum="1"/>
       <value maximum="100"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6551,9 +6583,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="filename" platform="all">
-
+  
       <value default="/usr/local/mysql/share/mysql/english/"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6573,9 +6605,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="boolean" platform="linux">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -6614,7 +6646,7 @@
     <xrefto id="option_mysqld_lc_time_names"/>
     <name>lc_time_names</name>
     <shortdescription lang="en">The locale that controls the language used to display day and month
-      names</shortdescription>
+        names</shortdescription>
     <types>
       <vartype class="system" isdynamic="yes" scope="both"/>
     </types>

@@ -6639,9 +6671,9 @@
       <vartype class="system" isdynamic="yes" scope="global" format="local_infile"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6661,9 +6693,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="OFF"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6710,20 +6742,20 @@
     <xrefto id="option_mysqld_log-bin-trust-function-creators"/>
     <name>log-bin-trust-function-creators</name>
     <shortdescription lang="en">If equal to 0 (the default), then when --log-bin is used, creation
-      of a stored function is allowed only to users having the SUPER privilege and only if the
-      function created does not break binary logging</shortdescription>
+        of a stored function is allowed only to users having the SUPER privilege and only if the
+        function created does not break binary logging</shortdescription>
     <seealso xref="log-bin-trust-routine-creators"/>
     <types>
       <optype class="cmdline" format="--log-bin-trust-function-creators"
-        setvar="log_bin_trust_function_creators"/>
+          setvar="log_bin_trust_function_creators"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="both" class="system" format="log_bin_trust_function_creators"
-      />
+        />
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -6738,14 +6770,14 @@
     <deprecated version="5.0.16" xref="log-bin-trust-function-creators"/>
     <types>
       <optype class="cmdline" format="--log-bin-trust-routine-creators"
-        setvar="log_bin_trust_routine_creators"/>
+          setvar="log_bin_trust_routine_creators"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -6790,7 +6822,7 @@
     <xrefto id="option_mysqld_log-long-format"/>
     <name>log-long-format</name>
     <shortdescription lang="en">Log some extra information to update log. Please note that this
-      option is deprecated; see --log-short-format option</shortdescription>
+        option is deprecated; see --log-short-format option</shortdescription>
     <seealso xref="log-short-format"/>
     <deprecated version="4.1"/>
     <types>

@@ -6806,19 +6838,19 @@
     <xrefto id="option_mysqld_log_output"/>
     <name>log_output</name>
     <shortdescription lang="en">Syntax: log-output[=value[,value...]], where "value" could be TABLE,
-      FILE, or NONE</shortdescription>
+        FILE, or NONE</shortdescription>
     <types>
       <optype class="cmdline" format="--log_output[=name]" setvar="log_output"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" format="log_output" scope="global"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <value default="TABLE"/>
       <choice value="TABLE"/>
       <choice value="FILE"/>
       <choice value="NONE"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -6830,15 +6862,15 @@
     <xrefto id="option_mysqld_log-queries-not-using-indexes"/>
     <name>log-queries-not-using-indexes</name>
     <shortdescription lang="en">Log queries that are executed without benefit of any index to the
-      slow log if it is open</shortdescription>
+        slow log if it is open</shortdescription>
     <seealso xref="log-slow-queries"/>
     <types>
       <optype class="cmdline" format="--log-queries-not-using-indexes"
-        setvar="log_queries_not_using_indexes"/>
+          setvar="log_queries_not_using_indexes"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system" format="log_queries_not_using_indexes"/>
       <vartype isdynamic="yes" scope="global" class="system" 
-        inversion="5.1.21"/>
+          inversion="5.1.21"/>
     </types>
     <values vartype="boolean" platform="all"></values>
     <versions>

@@ -6860,9 +6892,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6875,16 +6907,16 @@
     <xrefto id="option_mysqld_log-slave-updates"/>
     <name>log-slave-updates</name>
     <shortdescription lang="en">This option tells the slave to log the updates performed by its SQL
-      thread to its own binary log</shortdescription>
+        thread to its own binary log</shortdescription>
     <types>
       <optype class="cmdline" format="--log-slave-updates" setvar="log_slave_updates"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6897,16 +6929,16 @@
     <xrefto id="option_mysqld_log-slow-admin-statements"/>
     <name>log-slow-admin-statements</name>
     <shortdescription lang="en">Log slow OPTIMIZE, ANALYZE, ALTER and other administrative
-      statements to the slow log if it is open</shortdescription>
+        statements to the slow log if it is open</shortdescription>
     <types>
       <optype class="cmdline" format="--log-slow-admin-statements"
-        setvar="log-slow-admin-statements"/>
+          setvar="log-slow-admin-statements"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -6920,16 +6952,16 @@
     <xrefto id="option_mysqld_log-slow-queries"/>
     <name>log-slow-queries</name>
     <shortdescription lang="en">Log slow queries to this log file. Defaults logging to
-      hostname-slow.log file. Must be enabled to activate other slow log options</shortdescription>
+        hostname-slow.log file. Must be enabled to activate other slow log options</shortdescription>
     <deprecated version="5.1.6" xref="log-slow-queries"/>
     <types>
       <optype class="cmdline" format="--log-slow-queries[=name]" setvar="log_slow_queries"
-        outversion="5.1.6"/>
+          outversion="5.1.6"/>
       <optype class="cmdline" format="--log-slow-queries" inversion="5.1.6"
-        setvar="log_slow_queries"/>
+          setvar="log_slow_queries"/>
       <optype class="mycnf" outversion="5.1.6"/>
       <vartype scope="both" isdynamic="yes" class="system"
-        outversion="5.1.6"/>
+          outversion="5.1.6"/>
     </types>
     <values vartype="filename" platform="all"/>
     <versions>

@@ -6942,15 +6974,15 @@
     <xrefto id="option_mysqld_log-tc"/>
     <name>log-tc</name>
     <shortdescription lang="en">Path to transaction coordinator log (used for transactions that
-      affect more than one storage engine, when binary log is disabled)</shortdescription>
+        affect more than one storage engine, when binary log is disabled)</shortdescription>
     <types>
       <optype class="cmdline" format="--log-tc=name" setvar="log-tc"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="filename" platform="all">
-
+  
       <value default="tc.log"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -6968,9 +7000,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="24576"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -6982,7 +7014,7 @@
   <option command="mysqld" section="server" id="log-update">
     <name>log-update</name>
     <shortdescription lang="en">Deprecated. If the MySQL server is started with 
-      --log-update, it is translated to --log-bin</shortdescription>
+        --log-update, it is translated to --log-bin</shortdescription>
     <deprecated version="5.0" xref="log-bin"/>
     <types>
       <optype class="cmdline" format="--log-update[=name]" setvar="log-update"/>

@@ -7004,9 +7036,9 @@
       <vartype isdynamic="yes" scope="both" class="system" format="log_warnings"/>
     </types>
     <values vartype="numeric" platform="all" inversion="4.1.3">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7019,7 +7051,7 @@
     <xrefto id="option_mysqld_long_query_time"/>
     <name>long_query_time</name>
     <shortdescription lang="en">Log all queries that have taken more than long_query_time seconds to
-      execute to file</shortdescription>
+        execute to file</shortdescription>
     <seealso xref="log-slow-queries"/>
     <types>
       <optype class="cmdline" format="--long_query_time=#" setvar="long_query_time"/>

@@ -7027,10 +7059,10 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value minimum="1"/>
       <value default="10"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7049,9 +7081,9 @@
       <vartype isdynamic="yes" scope="both" class="system" format="low_priority_updates"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7064,17 +7096,17 @@
     <xrefto id="option_mysqld_lower_case_table_names"/>
     <name>lower_case_table_names</name>
     <shortdescription lang="en">If set to 1 table names are stored in lowercase on disk and table
-      names will be case-insensitive. Should be set to 2 if you are using a case insensitive file
-      system</shortdescription>
+        names will be case-insensitive. Should be set to 2 if you are using a case insensitive file
+        system</shortdescription>
     <types>
       <optype class="cmdline" format="--lower_case_table_names[=#]" setvar="lower_case_table_names"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="both" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7087,8 +7119,8 @@
     <xrefto id="replication-options"/>
     <name>master-bind</name>
     <shortdescription lang="en">The network interface which is to be
-      used for connecting to the master by a replication slave having
-      multiple network connections</shortdescription> 
+        used for connecting to the master by a replication slave having
+        multiple network connections</shortdescription>
     <types>
       <optype class="cmdline" format="--master-bind=name"/>
       <optype class="mycnf"/>

@@ -7105,7 +7137,7 @@
     <xrefto id="replication-options"/>
     <name>master-connect-retry</name>
     <shortdescription lang="en">The number of seconds the slave thread will sleep before retrying to
-      connect to the master in case the master goes down or the connection is lost</shortdescription>
+        connect to the master in case the master goes down or the connection is lost</shortdescription>
     <deprecated version="5.1.17"/>
     <removed version="5.2.0"/>
     <types>

@@ -7114,9 +7146,9 @@
       <vartype class="system" isdynamic="no"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="60"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7145,15 +7177,15 @@
     <xrefto id="replication-options"/>
     <name>master-info-file</name>
     <shortdescription lang="en">The location and name of the file that remembers the master and
-      where the I/O replication thread is in the master's binlogs</shortdescription>
+        where the I/O replication thread is in the master's binlogs</shortdescription>
     <types>
       <optype class="cmdline" format="--master-info-file=name" setvar="master-info-file"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="filename" platform="all">
-
+  
       <value default="master.info"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7166,7 +7198,7 @@
     <xrefto id="replication-options"/>
     <name>master-password</name>
     <shortdescription lang="en">The password the slave thread will authenticate with when connecting
-      to the master</shortdescription>
+        to the master</shortdescription>
     <seealso xref="master-info-file"/>
     <deprecated version="5.1.17"/>
     <removed version="5.2.0"/>

@@ -7193,9 +7225,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="3306"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7207,16 +7239,16 @@
     <xrefto id="replication-options"/>
     <name>master-retry-count</name>
     <shortdescription lang="en">The number of tries the slave will make to connect to the master
-      before giving up</shortdescription>
+        before giving up</shortdescription>
     <seealso xref="master-info-file"/>
     <types>
       <optype class="cmdline" format="--master-retry-count=#" setvar="master-retry-count"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="86400"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7237,9 +7269,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7287,7 +7319,7 @@
     <xrefto id="option_mysqld_master-ssl"/>
     <name>master-ssl-cert</name>
     <shortdescription lang="en">Master SSL certificate file name. Only applies if you have enabled
-      master-ssl</shortdescription>
+        master-ssl</shortdescription>
     <seealso xref="master-info-file"/>
     <deprecated version="5.1.17"/>
     <removed version="5.2.0"/>

@@ -7342,8 +7374,8 @@
     <xrefto id="replication-options"/>
     <name>master-user</name>
     <shortdescription lang="en">The username the slave thread will use for authentication when
-      connecting to the master. The user must have FILE privilege. If the master user is not set,
-      user test is assumed. The value in master.info will take precedence if it can be read</shortdescription>
+        connecting to the master. The user must have FILE privilege. If the master user is not set,
+        user test is assumed. The value in master.info will take precedence if it can be read</shortdescription>
     <seealso xref="master-info-file"/>
     <deprecated version="5.1.17"/>
     <removed version="5.2.0"/>

@@ -7352,9 +7384,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="string" platform="all">
-
+  
       <value default="test"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7371,9 +7403,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7392,9 +7424,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1048576"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7407,16 +7439,16 @@
     <xrefto id="option_mysqld_max_binlog_cache_size"/>
     <name>max_binlog_cache_size</name>
     <shortdescription lang="en">Can be used to restrict the total size used to cache a
-      multi-transaction query</shortdescription>
+        multi-transaction query</shortdescription>
     <types>
       <optype class="cmdline" format="--max_binlog_cache_size=#" setvar="max_binlog_cache_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="4294967295" maximum="4294967295" minimum="4096"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7429,17 +7461,17 @@
     <xrefto id="option_mysqld_max_binlog_size"/>
     <name>max_binlog_size</name>
     <shortdescription lang="en">Binary log will be rotated automatically when the size exceeds this
-      value</shortdescription>
+        value</shortdescription>
     <types>
       <optype class="cmdline" format="--max_binlog_size=#" setvar="max_binlog_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1073741824"/>
       <value minimum="4096"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7452,16 +7484,16 @@
     <xrefto id="option_mysqld_max_connect_errors"/>
     <name>max_connect_errors</name>
     <shortdescription lang="en">If there is more than this number of interrupted connections from a
-      host this host will be blocked from further connections</shortdescription>
+        host this host will be blocked from further connections</shortdescription>
     <types>
       <optype class="cmdline" format="--max_connect_errors=#" setvar="max_connect_errors"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="10"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7481,14 +7513,14 @@
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all" outversion="5.1.14">
-
+  
       <value default="100"/>
-
+  
     </values>
     <values vartype="numeric" platform="all" inversion="5.1.15">
-
+  
       <value default="151"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7501,16 +7533,16 @@
     <xrefto id="option_mysqld_max_delayed_threads"/>
     <name>max_delayed_threads</name>
     <shortdescription lang="en">Don't start more than this number of threads to handle INSERT
-      DELAYED statements. If set to zero, which means INSERT DELAYED is not used</shortdescription>
+        DELAYED statements. If set to zero, which means INSERT DELAYED is not used</shortdescription>
     <types>
       <optype class="cmdline" format="--max_delayed_threads=#" setvar="max_delayed_threads"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="20"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7523,16 +7555,16 @@
     <xrefto id="option_mysqld_max_error_count"/>
     <name>max_error_count</name>
     <shortdescription lang="en">Max number of errors/warnings to store for a statement.
-      --max_heap_table_size=# Don't allow creation of heap tables bigger than this</shortdescription>
+        --max_heap_table_size=# Don't allow creation of heap tables bigger than this</shortdescription>
     <types>
       <optype class="cmdline" format="--max_error_count=#" setvar="max_error_count"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="64"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7552,9 +7584,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="16777216"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7583,16 +7615,16 @@
     <xrefto id="option_mysqld_max_join_size"/>
     <name>max_join_size</name>
     <shortdescription lang="en">Joins that are probably going to read more than max_join_size
-      records return an error</shortdescription>
+        records return an error</shortdescription>
     <types>
       <optype class="cmdline" format="--max_join_size=#" setvar="max_join_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1,000,000"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7607,14 +7639,14 @@
     <shortdescription lang="en">Max number of bytes in sorted records</shortdescription>
     <types>
       <optype class="cmdline" format="--max_length_for_sort_data=#"
-        setvar="max_length_for_sort_data"/>
+          setvar="max_length_for_sort_data"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1024"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7630,16 +7662,16 @@
     <shortdescription lang="en">Maximum number of prepared statements in the server</shortdescription>
     <types>
       <optype class="cmdline" format="--max_prepared_stmt_count=#" setvar="max_prepared_stmt_count"
-        inversion="5.0.21"/>
+          inversion="5.0.21"/>
       <optype class="mycnf" inversion="5.0.21"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="16382"/>
       <value minimum="0"/>
       <value maximum="1,000,000"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7655,16 +7687,16 @@
     <xrefto id="option_mysqld_max_relay_log_size"/>
     <name>max_relay_log_size</name>
     <shortdescription lang="en">If non-zero: relay log will be rotated automatically when the size
-      exceeds this value</shortdescription>
+        exceeds this value</shortdescription>
     <types>
       <optype class="cmdline" format="--max_relay_log_size=#" setvar="max_relay_log_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0" minimum="4096" maximum="1GB"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7677,16 +7709,16 @@
     <xrefto id="option_mysqld_max_seeks_for_key"/>
     <name>max_seeks_for_key</name>
     <shortdescription lang="en">Limit assumed max number of seeks when looking up rows based on a
-      key</shortdescription>
+        key</shortdescription>
     <types>
       <optype class="cmdline" format="--max_seeks_for_key=#" setvar="max_seeks_for_key"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="4294967295"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7705,9 +7737,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1024"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7726,10 +7758,10 @@
       <vartype isdynamic="yes" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
       <value maximum="255"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -7747,9 +7779,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="32"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7762,7 +7794,7 @@
     <xrefto id="option_mysqld_max_user_connections"/>
     <name>max_user_connections</name>
     <shortdescription lang="en">The maximum number of active connections for a single user (0 = no
-      limit)</shortdescription>
+        limit)</shortdescription>
     <types>
       <optype class="cmdline" format="--max_user_connections=#" setvar="max_user_connections"/>
       <optype class="mycnf"/>

@@ -7770,9 +7802,9 @@
       <vartype class="system" isdynamic="yes" scope="both" inversion="5.0.3"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7791,9 +7823,9 @@
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="4294967295"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7812,9 +7844,9 @@
       <vartype isdynamic="no" scope="global" class="system" />
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7831,9 +7863,9 @@
       <vartype class="system" scope="global" isdynamic="no"/>
     </types>
     <values vartype="string" platform="all">
-
+  
       <value default="GPL"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7852,9 +7884,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7882,16 +7914,16 @@
     <xrefto id="option_mysqld_multi_range_count"/>
     <name>multi_range_count</name>
     <shortdescription lang="en">The maximum number of ranges to send to a table handler at once
-      during range selects</shortdescription>
+        during range selects</shortdescription>
     <types>
       <optype class="cmdline" format="--multi_range_count=#" setvar="multi_range_count"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="256"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -7910,9 +7942,9 @@
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1024"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7927,23 +7959,23 @@
     <shortdescription lang="en">Default pointer size to be used for MyISAM tables</shortdescription>
     <types>
       <optype class="cmdline" format="--myisam_data_pointer_size=#"
-        setvar="myisam_data_pointer_size"/>
+          setvar="myisam_data_pointer_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all" outversion="5.0.6">
-
+  
       <value default="4"/>
       <value minimum="2"/>
       <value maximum="7"/>
-
+  
     </values>
     <values vartype="numeric" platform="all" inversion="5.0.6">
-
+  
       <value default="6"/>
       <value minimum="2"/>
       <value maximum="7"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7960,14 +7992,14 @@
     <deprecated version="5.0.6"/>
     <types>
       <optype class="cmdline" format="--myisam_max_extra_sort_file_size=#"
-        setvar="myisam_max_extra_sort_file_size" outversion="5.0.6"/>
+          setvar="myisam_max_extra_sort_file_size" outversion="5.0.6"/>
       <optype class="mycnf" outversion="5.0.6"/>
       <vartype isdynamic="no" scope="global" class="system" outversion="5.0.6"/>
     </types>
     <values vartype="numeric" platform="all" outversion="5.0.6">
-
+  
       <value default="2147483648"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -7978,17 +8010,17 @@
     <xrefto id="option_mysqld_myisam_max_sort_file_size"/>
     <name>myisam_max_sort_file_size</name>
     <shortdescription lang="en">Don't use the fast sort index method to created index if the
-      temporary file would get bigger than this</shortdescription>
+        temporary file would get bigger than this</shortdescription>
     <types>
       <optype class="cmdline" format="--myisam_max_sort_file_size=#"
-        setvar="myisam_max_sort_file_size"/>
+          setvar="myisam_max_sort_file_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="2147483648"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8007,13 +8039,13 @@
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <value default="OFF"/>
       <choice value="DEFAULT"/>
       <choice value="BACKUP"/>
       <choice value="FORCE"/>
       <choice value="QUICK"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8026,16 +8058,16 @@
     <xrefto id="option_mysqld_myisam_repair_threads"/>
     <name>myisam_repair_threads</name>
     <shortdescription lang="en">Number of threads to use when repairing MyISAM tables. The value of
-      1 disables parallel repair</shortdescription>
+        1 disables parallel repair</shortdescription>
     <types>
       <optype class="cmdline" format="--myisam_repair_threads=#" setvar="myisam_repair_threads"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8048,16 +8080,16 @@
     <xrefto id="option_mysqld_myisam_sort_buffer_size"/>
     <name>myisam_sort_buffer_size</name>
     <shortdescription lang="en">The buffer that is allocated when sorting the index when doing a
-      REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE</shortdescription>
+        REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE</shortdescription>
     <types>
       <optype class="cmdline" format="--myisam_sort_buffer_size=#" setvar="myisam_sort_buffer_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="8388608"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8070,22 +8102,22 @@
     <xrefto id="option_mysqld_myisam_stats_method"/>
     <name>myisam_stats_method</name>
     <shortdescription lang="en">Specifies how MyISAM index statistics collection code should treat
-      NULLs</shortdescription>
+        NULLs</shortdescription>
     <types>
       <optype class="cmdline" format="--myisam_stats_method=name" setvar="myisam_stats_method"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="enumeration" platform="all" inversion="4.1" outversion="5.0">
-
+  
       <value default="nulls_unequal"/>
-
+  
     </values>
     <values vartype="enumeration" inversion="5.0" platform="all">
-
+  
       <choice value="nulls_equal"/>
       <choice value="nulls_unequal"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8100,16 +8132,16 @@
     <xrefto id="option_mysqld_multi_read_range"/>
     <name>multi_read_range</name>
     <shortdescription lang="en">Specifies the maximum number of ranges to send to a storage engine
-      during range selects</shortdescription>
+        during range selects</shortdescription>
     <types>
       <optype class="cmdline" format="--multi_read_range=#" setvar="multi_read_range"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="256"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -8119,7 +8151,7 @@
     </versions>
   </option>
   <option command="mysqld" section="myisam" id="myisam_use_mmap">
-<!-- check 5.1 manual -->
+  <!-- check 5.1 manual -->
     <xrefto id="option_mysqld_myisam_use_mmap"/>
     <name>myisam_use_mmap</name>
     <shortdescription lang="en">Use memory mapping for reading and writing MyISAM tables</shortdescription>

@@ -8129,9 +8161,9 @@
       <vartype isdynamic="no" class="system" scope="global"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <introduced version="5.1.4"/>

@@ -8144,15 +8176,15 @@
     <shortdescription lang="en">NDB Auto-increment prefetch size</shortdescription>
     <types>
       <optype class="cmdline" format="--ndb_autoincrement_prefetch_sz"
-        setvar="ndb_autoincrement_prefetch_sz"/>
+          setvar="ndb_autoincrement_prefetch_sz"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" format="" scope="both" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="32"/>
       <value minimum="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8166,16 +8198,16 @@
     <xrefto id="option_mysqld_ndb_cache_check_time"/>
     <name>ndb_cache_check_time</name>
     <shortdescription lang="en">The number of milliseconds to wait before checking the NDB query
-      cache</shortdescription>
+        cache</shortdescription>
     <types>
       <optype class="cmdline" format="--ndb_cache_check_time" setvar="ndb_cache_check_time"/>
       <vartype class="system" scope="both" format="ndb_cache_check_time" isdynamic="yes"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8194,11 +8226,11 @@
       <vartype class="system"  isdynamic="no"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
       <value minimum="1"/>
       <value maximum="63"/>
-
+  
     </values>
     <versions>
       <introduced version="5.1.19-ndb-6.2.2"/>

@@ -8206,7 +8238,7 @@
     </versions>
   </option>
   <option command="mysqld" section="ndb" id="ndb_use_copying_alter_table">
-<!-- check 5.1 -->
+  <!-- check 5.1 -->
     <xrefto id="option_mysqld_ndb_use_copying_alter_table"/>
     <name>ndb_use_copying_alter_table</name>
     <shortdescription lang="en">NDB Use Copying Alter Table</shortdescription>

@@ -8222,16 +8254,16 @@
   <option command="mysqld" section="ndb" id="ndb_extra_logging">
     <name>ndb_extra_logging</name>
     <shortdescription lang="en"> This variable can be set to a non-zero value to enable extra NDB
-      logging </shortdescription>
+        logging </shortdescription>
     <types>
       <vartype class="system" isdynamic="yes" scope="global"/>
       <optype class="cmdline" format="ndb_extra_logging #"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -8243,16 +8275,16 @@
     <xrefto id="option_mysqld_ndb_force_send"/>
     <name>ndb_force_send</name>
     <shortdescription lang="en">Forces sending of buffers to NDB immediately, without waiting for
-      other threads</shortdescription>
+        other threads</shortdescription>
     <types>
       <optype class="cmdline" format="--ndb-force-send" setvar="ndb_force_send"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8270,9 +8302,9 @@
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="OFF"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8286,16 +8318,16 @@
     <xrefto id="option_mysqld_ndb_wait_connected"/>
     <name>ndb_wait_connected</name>
     <shortdescription lang="en">Time (in seconds) for the MySQL server to wait for connection to
-      cluster management and data nodes before accepting MySQL client connections.</shortdescription>
+        cluster management and data nodes before accepting MySQL client connections.</shortdescription>
     <types>
       <optype class="cmdline" format="--ndb_wait_connected=#" setvar="ndb_wait_connected"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -8313,9 +8345,9 @@
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8334,9 +8366,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="16384"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8349,16 +8381,16 @@
     <xrefto id="option_mysqld_net_read_timeout"/>
     <name>net_read_timeout</name>
     <shortdescription lang="en">Number of seconds to wait for more data from a connection before
-      aborting the read</shortdescription>
+        aborting the read</shortdescription>
     <types>
       <optype class="cmdline" format="--net_read_timeout=#" setvar="net_read_timeout"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="30"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8371,16 +8403,16 @@
     <xrefto id="option_mysqld_net_retry_count"/>
     <name>net_retry_count</name>
     <shortdescription lang="en">If a read on a communication port is interrupted, retry this many
-      times before giving up</shortdescription>
+        times before giving up</shortdescription>
     <types>
       <optype class="cmdline" format="--net_retry_count=#" setvar="net_retry_count"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="10"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8393,16 +8425,16 @@
     <xrefto id="option_mysqld_net_write_timeout"/>
     <name>net_write_timeout</name>
     <shortdescription lang="en">Number of seconds to wait for a block to be written to a connection
-      before aborting the write</shortdescription>
+        before aborting the write</shortdescription>
     <types>
       <optype class="cmdline" format="--net_write_timeout=#" setvar="net_write_timeout"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="60"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8423,9 +8455,9 @@
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8435,11 +8467,11 @@
     </versions>
   </option>
   <option command="mysqld" section="server" id="no-defaults">
-<!-- this is actually a general option -->
+  <!-- this is actually a general option -->
     <xrefto id="option_no-defaults"/>
     <name>no-defaults</name>
     <shortdescription lang="en">To see the values that a server will use based on its compiled-in
-      defaults, ignoring the settings in any option files</shortdescription>
+        defaults, ignoring the settings in any option files</shortdescription>
     <types>
       <optype class="cmdline" format="--no-defaults"/>
     </types>

@@ -8460,9 +8492,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8479,9 +8511,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -8492,16 +8524,16 @@
     <xrefto id="option_mysqld_old-passwords"/>
     <name>old-passwords</name>
     <shortdescription lang="en">Use old password encryption method (needed for 4.0 and older
-      clients)</shortdescription>
+        clients)</shortdescription>
     <types>
       <optype class="cmdline" format="--old_passwords" setvar="old_passwords"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="both" class="system" format="old_passwords"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8513,15 +8545,15 @@
   <option command="mysqld" section="server" id="old-style-user-limits">
     <name>old-style-user-limits</name>
     <shortdescription lang="en">Enable old-style user limits (before 5.0.3 user resources were
-      counted per each user+host vs. per account) </shortdescription>
+        counted per each user+host vs. per account) </shortdescription>
     <types>
       <optype class="cmdline" format="--old-style-user-limits" setvar="old-style-user-limits"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -8533,7 +8565,7 @@
     <xrefto id="option_mysqld_open_files_limit"/>
     <name>open_files_limit</name>
     <shortdescription lang="en">If this is not 0, then mysqld will use this value to reserve file
-      descriptors to use with setrlimit()</shortdescription>
+        descriptors to use with setrlimit()</shortdescription>
     <types>
       <optype class="cmdline" format="--open_files_limit=#" setvar="open_files_limit"/>
       <optype class="mycnf"/>

@@ -8551,16 +8583,16 @@
     <xrefto id="option_mysqld_optimizer_prune_level"/>
     <name>optimizer_prune_level</name>
     <shortdescription lang="en">Controls the heuristic(s) applied during query optimization to prune
-      less-promising partial plans from the optimizer search space</shortdescription>
+        less-promising partial plans from the optimizer search space</shortdescription>
     <types>
       <optype class="cmdline" format="--optimizer_prune_level[=#]" setvar="optimizer_prune_level"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -8579,9 +8611,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="62"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -8617,9 +8649,9 @@
       <vartype isdynamic="no" class="system"/>
     </types>
     <values vartype="filename" platform="all">
-
+  
       <value default="/usr/local/mysql/lib/mysql"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -8638,9 +8670,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="3306"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8653,15 +8685,15 @@
     <xrefto id="option_mysqld_port-open-timeout"/>
     <name>port-open-timeout</name>
     <shortdescription lang="en">Maximum time in seconds to wait for the port to become free
-      (Default: no wait)</shortdescription>
+        (Default: no wait)</shortdescription>
     <types>
       <optype class="cmdline" format="--port-open-timeout=#" setvar="port-open-timeout"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -8681,9 +8713,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="32768"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8694,7 +8726,7 @@
     </versions>
   </option>
   <option command="mysqld" section="server" id="print-defaults">
-<!-- this is actually a general option -->
+  <!-- this is actually a general option -->
     <xrefto id="option_print-defaults"/>
     <name>print-defaults</name>
     <shortdescription lang="en">Print defaults</shortdescription>

@@ -8715,9 +8747,9 @@
       <vartype class="system" isdynamic="no" scope="session"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="OFF"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -8731,9 +8763,9 @@
       <vartype class="system" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="15"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -8750,9 +8782,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="8192"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8771,9 +8803,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1048576"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8786,17 +8818,17 @@
     <xrefto id="option_mysqld_query_cache_min_res_unit"/>
     <name>query_cache_min_res_unit</name>
     <shortdescription lang="en">Minimal size of unit in which space for results is allocated (last
-      unit will be trimmed after writing all result data)</shortdescription>
+        unit will be trimmed after writing all result data)</shortdescription>
     <types>
       <optype class="cmdline" format="--query_cache_min_res_unit=#"
-        setvar="query_cache_min_res_unit"/>
+          setvar="query_cache_min_res_unit"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="4096"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8815,9 +8847,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8836,12 +8868,12 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <value default="1"/>
       <choice value="0"/>
       <choice value="1"/>
       <choice value="2"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8856,14 +8888,14 @@
     <shortdescription lang="en">Invalidate queries in query cache on LOCK for write</shortdescription>
     <types>
       <optype class="cmdline" format="--query_cache_wlock_invalidate"
-        setvar="query_cache_wlock_invalidate"/>
+          setvar="query_cache_wlock_invalidate"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8882,9 +8914,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="8192"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8903,9 +8935,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="2048"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8918,16 +8950,16 @@
     <xrefto id="option_mysqld_read_buffer_size"/>
     <name>read_buffer_size</name>
     <shortdescription lang="en">Each thread that does a sequential scan allocates a buffer of this
-      size for each table it scans</shortdescription>
+        size for each table it scans</shortdescription>
     <types>
       <optype class="cmdline" format="--read_buffer_size=#" setvar="read_buffer_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="131072"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8946,9 +8978,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8961,17 +8993,17 @@
     <xrefto id="option_mysqld_read_rnd_buffer_size"/>
     <name>read_rnd_buffer_size</name>
     <shortdescription lang="en">When reading rows in sorted order after a sort, the rows are read
-      through this buffer to avoid a disk seeks. If not set, then it's set to the value of
-      record_buffer</shortdescription>
+        through this buffer to avoid a disk seeks. If not set, then it's set to the value of
+        record_buffer</shortdescription>
     <types>
       <optype class="cmdline" format="--read_rnd_buffer_size=#" setvar="read_rnd_buffer_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="262144"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -8990,9 +9022,9 @@
       <vartype isdynamic="no" class="system" outversion="4.0.3"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="131072"/>
-
+  
     </values>
     <versions></versions>
   </option>

@@ -9017,7 +9049,7 @@
     <xrefto id="option_mysqld_relay-log-index"/>
     <name>relay-log-index</name>
     <shortdescription lang="en">The location and name to use for the file that keeps a list of the
-      last relay logs</shortdescription>
+        last relay logs</shortdescription>
     <types>
       <optype class="cmdline" format="--relay-log-index=name" setvar="relay-log-index"/>
       <optype class="mycnf"/>

@@ -9034,15 +9066,15 @@
     <xrefto id="option_mysqld_relay-log-info-file"/>
     <name>relay-log-info-file</name>
     <shortdescription lang="en">The location and name of the file that remembers where the SQL
-      replication thread is in the relay logs</shortdescription>
+        replication thread is in the relay logs</shortdescription>
     <types>
       <optype class="cmdline" format="--relay-log-info-file=name" setvar="relay-log-info-file"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="filename" platform="all">
-
+  
       <value default="relay-log.info"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9061,9 +9093,9 @@
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9082,9 +9114,9 @@
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9097,7 +9129,7 @@
     <xrefto id="replication-options"/>
     <name>replicate-do-db</name>
     <shortdescription lang="en">Tells the slave thread to restrict replication to the specified
-      database</shortdescription>
+        database</shortdescription>
     <seealso xref="replicate-ignore-db"/>
     <types>
       <optype class="cmdline" format="--replicate-do-db=name"/>

@@ -9115,7 +9147,7 @@
     <xrefto id="replication-options"/>
     <name>replicate-do-table</name>
     <shortdescription lang="en">Tells the slave thread to restrict replication to the specified
-      table</shortdescription>
+        table</shortdescription>
     <seealso xref="replicate-ignore-table"/>
     <types>
       <optype class="cmdline" format="--replicate-do-table=name"/>

@@ -9188,9 +9220,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9204,7 +9236,7 @@
     <xrefto id="replication-options"/>
     <name>replicate-wild-do-table</name>
     <shortdescription lang="en">Tells the slave thread to restrict replication to the tables that
-      match the specified wildcard pattern</shortdescription>
+        match the specified wildcard pattern</shortdescription>
     <types>
       <optype class="cmdline" format="--replicate-wild-do-table=name"/>
       <optype class="mycnf"/>

@@ -9221,7 +9253,7 @@
     <xrefto id="replication-options"/>
     <name>replicate-wild-ignore-table</name>
     <shortdescription lang="en">Tells the slave thread not to replicate to the tables that match the
-      given wildcard pattern</shortdescription>
+        given wildcard pattern</shortdescription>
     <types>
       <optype class="cmdline" format="--replicate-wild-ignore-table=name"/>
       <optype class="mycnf"/>

@@ -9238,7 +9270,7 @@
     <xrefto id="option_mysqld_report-host"/>
     <name>report-host</name>
     <shortdescription lang="en">Hostname or IP of the slave to be reported to the master during
-      slave registration</shortdescription>
+        slave registration</shortdescription>
     <types>
       <optype class="cmdline" format="--report-host=name" setvar="report-host"/>
       <optype class="mycnf"/>

@@ -9255,7 +9287,7 @@
     <xrefto id="option_mysqld_report-password"/>
     <name>report-password</name>
     <shortdescription lang="en">The account password that a slave server should report to the master
-      server</shortdescription>
+        server</shortdescription>
     <types>
       <optype class="cmdline" format="--report-password=name" setvar="report-password"/>
       <optype class="mycnf"/>

@@ -9273,15 +9305,15 @@
     <xrefto id="option_mysqld_report-port"/>
     <name>report-port</name>
     <shortdescription lang="en">Port for connecting to slave reported to the master during slave
-      registration</shortdescription>
+        registration</shortdescription>
     <types>
       <optype class="cmdline" format="--report-port=#" setvar="report-port"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="3306"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9294,7 +9326,7 @@
     <xrefto id="option_mysqld_report-user"/>
     <name>report-user</name>
     <shortdescription lang="en">The account name that a slave server should report to the master
-      server</shortdescription>
+        server</shortdescription>
     <types>
       <optype class="cmdline" format="--report-user=name" setvar="report-user"/>
       <optype class="mycnf"/>

@@ -9315,9 +9347,9 @@
       <vartype isdynamic="yes" scope="both" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9361,15 +9393,15 @@
     <xrefto id="option_mysqld_safe-user-create"/>
     <name>safe-user-create</name>
     <shortdescription lang="en">Don't allow new user creation by the user who has no write
-      privileges to the mysql.user table</shortdescription>
+        privileges to the mysql.user table</shortdescription>
     <types>
       <optype class="cmdline" format="--safe-user-create" setvar="safe-user-create"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9397,16 +9429,16 @@
     <xrefto id="option_mysqld_secure-auth"/>
     <name>secure-auth</name>
     <shortdescription lang="en">Disallow authentication for accounts that have old (pre-4.1)
-      passwords</shortdescription>
+        passwords</shortdescription>
     <types>
       <optype class="cmdline" format="--secure-auth" setvar="secure_auth"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="both" class="system" format="secure_auth"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9420,7 +9452,7 @@
     <xrefto id="option_mysqld_secure-file-priv"/>
     <name>secure-file-priv</name>
     <shortdescription lang="en">Limit LOAD_FILE(), LOAD DATA, and SELECT ... INTO OUTFILE to files
-      in a single directory</shortdescription>
+        in a single directory</shortdescription>
     <types>
       <optype class="cmdline" format="--secure-file-priv" setvar="secure_file_priv"/>
       <optype class="mycnf"/>

@@ -9439,16 +9471,16 @@
     <xrefto id="option_mysqld_server-id"/>
     <name>server-id</name>
     <shortdescription lang="en">Uniquely identifies the server instance in the community of
-      replication partners</shortdescription>
+        replication partners</shortdescription>
     <types>
       <optype class="cmdline" format="--server-id=#" setvar="server_id"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="both" class="system" format="server_id"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9460,7 +9492,7 @@
   <option command="mysqld" section="server" id="set-variable">
     <name>set-variable</name>
     <shortdescription lang="en">Change the value of a variable. Please note that this option is
-      deprecated;</shortdescription>
+        deprecated;</shortdescription>
     <deprecated version="5.0"/>
     <types>
       <optype class="cmdline" format="--set-variable=name"/>

@@ -9482,9 +9514,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9516,9 +9548,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9547,7 +9579,7 @@
     <xrefto id="option_mysqld_skip-concurrent-insert"/>
     <name>skip-concurrent-insert</name>
     <shortdescription lang="en">Turn off the ability to select and insert at the same time on MyISAM
-      tables</shortdescription>
+        tables</shortdescription>
     <seealso xref="concurrent-insert"/>
     <types>
       <optype class="cmdline" format="--skip-concurrent-insert" setvar="skip-concurrent_insert"/>

@@ -9581,15 +9613,15 @@
     <xrefto id="option_mysqld_skip-grant-tables"/>
     <name>skip-grant-tables</name>
     <shortdescription lang="en">Start without grant tables. This gives all users FULL ACCESS to all
-      tables</shortdescription>
+        tables</shortdescription>
     <types>
       <optype class="cmdline" format="--skip-grant-tables" setvar="skip-grant-tables"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9779,9 +9811,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9875,9 +9907,9 @@
       <vartype isdynamic="yes" scope="global" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="off"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -9888,16 +9920,16 @@
     <xrefto id="replication-options"/>
     <name>slave-load-tmpdir</name>
     <shortdescription lang="en">The location where the slave should put its temporary files when
-      replicating a LOAD DATA INFILE command</shortdescription>
+        replicating a LOAD DATA INFILE command</shortdescription>
     <types>
       <optype class="cmdline" format="--slave-load-tmpdir=name" setvar="slave_load_tmpdir"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="filename" platform="all">
-
+  
       <value default="/tmp"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9910,7 +9942,7 @@
     <xrefto id="replication-options"/>
     <name>slave-skip-errors</name>
     <shortdescription lang="en">Tells the slave thread to continue replication when a query returns
-      an error from the provided list</shortdescription>
+        an error from the provided list</shortdescription>
     <types>
       <optype class="cmdline" format="--slave-skip-errors=name" setvar="slave_skip_errors"/>
       <optype class="mycnf"/>

@@ -9929,14 +9961,14 @@
     <shortdescription lang="en">Use compression on master/slave protocol</shortdescription>
     <types>
       <optype class="cmdline" format="--slave_compressed_protocol"
-        setvar="slave_compressed_protocol"/>
+          setvar="slave_compressed_protocol"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" class="system" scope="global"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9949,7 +9981,7 @@
     <xrefto id="replication-options"/>
     <name>slave_net_timeout</name>
     <shortdescription lang="en">Number of seconds to wait for more data from a master/slave
-      connection before aborting the read</shortdescription>
+        connection before aborting the read</shortdescription>
     <seealso xref="net_read_timeout"/>
     <types>
       <optype class="cmdline" format="--slave-net-timeout=#" setvar="slave_net_timeout"/>

@@ -9957,9 +9989,9 @@
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="3600"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -9972,17 +10004,17 @@
     <xrefto id="option_mysqld_slave_transaction_retries"/>
     <name>slave_transaction_retries</name>
     <shortdescription lang="en">Number of times the slave SQL thread will retry a transaction in
-      case it failed with a deadlock or elapsed lock wait timeout, before giving up and stopping</shortdescription>
+        case it failed with a deadlock or elapsed lock wait timeout, before giving up and stopping</shortdescription>
     <types>
       <optype class="cmdline" format="--slave_transaction_retries=#"
-        setvar="slave_transaction_retries"/>
+          setvar="slave_transaction_retries"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="10"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10002,9 +10034,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -10032,7 +10064,7 @@
     <xrefto id="option_mysqld_slow_launch_time"/>
     <name>slow_launch_time</name>
     <shortdescription lang="en">If creating the thread takes longer than this value (in seconds),
-      the Slow_launch_threads counter will be incremented</shortdescription>
+        the Slow_launch_threads counter will be incremented</shortdescription>
     <seealso xref="Slow_launch_threads"/>
     <types>
       <optype class="cmdline" format="--slow_launch_time=#" setvar="slow_launch_time"/>

@@ -10040,9 +10072,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="2"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10061,24 +10093,24 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="filename" platform="linux">
-
+  
       <value default="/tmp/mysql.sock"/>
-
+  
     </values>
     <values vartype="filename" platform="hpux">
-
+  
       <value default="/tmp/mysql.sock"/>
-
+  
     </values>
     <values vartype="filename" platform="solaris">
-
+  
       <value default="/tmp/mysql.sock"/>
-
+  
     </values>
     <values vartype="filename" platform="macosx">
-
+  
       <value default="/tmp/mysql.sock"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10097,9 +10129,9 @@
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="2097144"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10114,13 +10146,13 @@
     <shortdescription lang="en">Option used by mysql-test for debugging and testing of replication</shortdescription>
     <types>
       <optype class="cmdline" format="--sporadic-binlog-dump-fail"
-        setvar="sporadic-binlog-dump-fail"/>
+          setvar="sporadic-binlog-dump-fail"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10133,15 +10165,15 @@
     <xrefto id="set-option"/>
     <name>sql-bin-update-same</name>
     <shortdescription lang="en">The update log is deprecated since version 5.0, is replaced by the
-      binary log and this option does nothing anymore</shortdescription>
+        binary log and this option does nothing anymore</shortdescription>
     <types>
       <optype class="cmdline" format="--sql-bin-update-same=#" setvar="sql-bin-update-same"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10157,7 +10189,7 @@
       <vartype isdynamic="yes" scope="both" class="system" format="sql_mode"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <choice value="ANSI"/>
       <choice value="STRICT_TRANS_TABLES"/>
       <choice value="TRADITIONAL"/>

@@ -10172,7 +10204,7 @@
       <choice value="NO_UNSIGNED_SUBTRACTION"/>
       <choice value="OFF"/>
       <value default="OFF"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10185,17 +10217,17 @@
     <xrefto id="set-option"/>
     <name>sql_auto_is_null</name>
     <shortdescription lang="en">If set to 1, you can find the last inserted row for a table that
-      contains an AUTO_INCREMENT column by using the following construct: WHERE
-      auto_increment_column IS NULL</shortdescription>
+        contains an AUTO_INCREMENT column by using the following construct: WHERE
+        auto_increment_column IS NULL</shortdescription>
     <types>
       <optype class="cmdline" format="--sql_auto_is_null"/>
       <optype class="mycnf"/>
       <vartype class="system" isdynamic="no" scope="session"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10208,7 +10240,7 @@
     <xrefto id="set-option"/>
     <name>sql_big_selects</name>
     <shortdescription lang="en">If set to 0, MySQL aborts SELECT statements that are likely to take
-      a very long time to execute</shortdescription>
+        a very long time to execute</shortdescription>
     <seealso xref="max_join_size"/>
     <types>
       <optype class="cmdline" format="--sql_big_selects"/>

@@ -10216,9 +10248,9 @@
       <vartype class="system" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10252,9 +10284,9 @@
       <vartype class="system" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10284,16 +10316,16 @@
     <xrefto id="set-option"/>
     <name>sql_log_off</name>
     <shortdescription lang="en">If set to 1, no logging is done to the general query log for this
-      client</shortdescription>
+        client</shortdescription>
     <types>
       <optype class="cmdline" format="--sql_log_off"/>
       <optype class="mycnf"/>
       <vartype class="system" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10365,9 +10397,9 @@
       <vartype class="system" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10382,16 +10414,16 @@
     <xrefto id="set-option"/>
     <name>sql_quote_show_create</name>
     <shortdescription lang="en">If set to 1 the server quotes identifiers for SHOW CREATE TABLE and
-      SHOW CREATE DATABASE statements</shortdescription>
+        SHOW CREATE DATABASE statements</shortdescription>
     <types>
       <optype class="cmdline" format="--sql_quote_show_create"/>
       <optype class="mycnf"/>
       <vartype class="system" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10404,16 +10436,16 @@
     <xrefto id="set-option"/>
     <name>sql_safe_updates</name>
     <shortdescription lang="en">If set to 1, MySQL aborts UPDATE or DELETE statements that do not
-      use a key in the WHERE clause or a LIMIT clause</shortdescription>
+        use a key in the WHERE clause or a LIMIT clause</shortdescription>
     <types>
       <optype class="cmdline" format="--sql_safe_updates"/>
       <optype class="mycnf"/>
       <vartype class="system" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10458,16 +10490,16 @@
     <xrefto id="set-option"/>
     <name>sql_warnings</name>
     <shortdescription lang="en">This variable controls whether single-row INSERT statements produce
-      an information string if warnings occur</shortdescription>
+        an information string if warnings occur</shortdescription>
     <types>
       <optype class="cmdline" format="--sql_warnings"/>
       <optype class="mycnf"/>
       <vartype class="system" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10487,9 +10519,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10614,9 +10646,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10637,9 +10669,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10656,9 +10688,9 @@
       <vartype isdynamic="yes" scope="global" class="system" format="sync_binlog"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10679,9 +10711,9 @@
       <vartype isdynamic="yes" scope="global" class="system" format="sync_frm"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10710,15 +10742,15 @@
     <xrefto id="option_mysqld_sysdate-is-now"/>
     <name>sysdate-is-now</name>
     <shortdescription lang="en">Non-default option to alias SYSDATE() to NOW() to make it
-      safe-replicable</shortdescription>
+        safe-replicable</shortdescription>
     <types>
       <optype class="cmdline" format="--sysdate-is-now" setvar="sysdate-is-now"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="FALSE"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -10739,9 +10771,9 @@
       <vartype isdynamic="yes" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="64"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10753,7 +10785,7 @@
     <xrefto id="option_mysqld_table_definition_cache"/>
     <name>table_definition_cache</name>
     <shortdescription lang="en">The number of table definitions that can be stored in the definition
-      cache.</shortdescription>
+        cache.</shortdescription>
     <types>
       <vartype isdynamic="no" class="system" scope="global"/>
     </types>

@@ -10768,16 +10800,16 @@
     <xrefto id="option_mysqld_table_lock_wait_timeout"/>
     <name>table_lock_wait_timeout</name>
     <shortdescription lang="en">Timeout in seconds to wait for a table level lock before returning
-      an error. Used only if the connection has active cursors</shortdescription>
+        an error. Used only if the connection has active cursors</shortdescription>
     <types>
       <optype class="cmdline" format="--table_lock_wait_timeout=#" setvar="table_lock_wait_timeout"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="50"/>
-
+  
     </values>
     <versions>
       <introduced version="5.0.10"/>

@@ -10823,16 +10855,16 @@
     <xrefto id="option_mysqld_tc-heuristic-recover"/>
     <name>tc-heuristic-recover</name>
     <shortdescription lang="en">Decision to use in heuristic recover process. Possible values are
-      COMMIT or ROLLBACK</shortdescription>
+        COMMIT or ROLLBACK</shortdescription>
     <types>
       <optype class="cmdline" format="--tc-heuristic-recover=name" setvar="tc-heuristic-recover"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <choice value="COMMIT"/>
       <choice value="RECOVER"/>
-
+  
     </values>
     <versions>
       <introduced version="5.0.3"/>

@@ -10845,15 +10877,15 @@
     <xrefto id="option_mysqld_temp-pool"/>
     <name>temp-pool</name>
     <shortdescription lang="en">Using this option will cause most temporary files created to use a
-      small set of names, rather than a unique name for each new file</shortdescription>
+        small set of names, rather than a unique name for each new file</shortdescription>
     <types>
       <optype class="cmdline" format="--temp-pool" setvar="temp-pool"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10872,9 +10904,9 @@
       <vartype isdynamic="yes" class="system" scope="global"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10887,16 +10919,16 @@
     <xrefto id="option_mysqld_thread_concurrency"/>
     <name>thread_concurrency</name>
     <shortdescription lang="en">Permits the application to give the threads system a hint for the
-      desired number of threads that should be run at the same time</shortdescription>
+        desired number of threads that should be run at the same time</shortdescription>
     <types>
       <optype class="cmdline" format="--thread_concurrency=#" setvar="thread_concurrency"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="10"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10915,15 +10947,15 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="196608"/>
-
+  
     </values>
     <values vartype="enumeration" platform="all">
-
+  
       <choice value="no-threads"/>
       <choice value="one-thread-per-connection"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -10941,9 +10973,9 @@
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="196608"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -10973,16 +11005,16 @@
     <xrefto id="option_mysqld_timed_mutexes"/>
     <name>timed_mutexes</name>
     <shortdescription lang="en">Specify whether to time mutexes (only InnoDB mutexes are currently
-      supported)</shortdescription>
+        supported)</shortdescription>
     <types>
       <optype class="cmdline" format="--timed_mutexes" setvar="timed_mutexes"/>
       <optype class="mycnf"/>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="OFF"/>
-
+  
     </values>
     <versions>
       <introduced version="5.0.3"/>

@@ -11011,16 +11043,16 @@
     <xrefto id="option_mysqld_tmp_table_size"/>
     <name>tmp_table_size</name>
     <shortdescription lang="en">If an in-memory temporary table exceeds this size, MySQL will
-      automatically convert it to an on-disk MyISAM table</shortdescription>
+        automatically convert it to an on-disk MyISAM table</shortdescription>
     <types>
       <optype class="cmdline" format="--tmp_table_size=#" setvar="tmp_table_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="33554432"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11056,12 +11088,12 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <choice value="READ-UNCOMMTTED"/>
       <choice value="READ-COMMITTED"/>
       <choice value="REPEATABLE-READ"/>
       <choice value="SERIALIZABLE"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11076,14 +11108,14 @@
     <shortdescription lang="en">Allocation block size for transactions to be stored in binary log</shortdescription>
     <types>
       <optype class="cmdline" format="--transaction_alloc_block_size=#"
-        setvar="transaction_alloc_block_size"/>
+          setvar="transaction_alloc_block_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="8192"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11098,14 +11130,14 @@
     <shortdescription lang="en">Persistent buffer for transactions to be stored in binary log</shortdescription>
     <types>
       <optype class="cmdline" format="--transaction_prealloc_size=#"
-        setvar="transaction_prealloc_size"/>
+          setvar="transaction_prealloc_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="4096"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11122,13 +11154,13 @@
       <vartype class="system" isdynamic="yes" scope="both"/>
     </types>
     <values vartype="enumeration" platform="all">
-
+  
       <value default="REPEATABLE-READ"/>
       <choice value="READ-UNCOMMITTED"/>
       <choice value="READ-COMMITTED"/>
       <choice value="REPEATABLE-READ"/>
       <choice value=" SERIALIZABLE "/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11140,16 +11172,16 @@
   <option command="mysqld" section="innodb" id="unique_checks">
     <name>unique_checks</name>
     <shortdescription lang="en">If set to 1 (the default), uniqueness checks for secondary indexes
-      in InnoDB tables are performed</shortdescription>
+        in InnoDB tables are performed</shortdescription>
     <types>
       <optype class="cmdline" format="--unique_checks"/>
       <optype class="mycnf"/>
       <vartype class="system" isdynamic="yes" scope="session"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11162,17 +11194,17 @@
     <xrefto id="option_mysqld_updatable_views_with_limit"/>
     <name>updatable_views_with_limit</name>
     <shortdescription lang="en">This variable controls whether updates to a view can be made when
-      the view does not contain all columns of the primary key</shortdescription>
+        the view does not contain all columns of the primary key</shortdescription>
     <types>
       <optype class="cmdline" format="--updatable_views_with_limit=#"
-        setvar="updatable_views_with_limit"/>
+          setvar="updatable_views_with_limit"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -11191,9 +11223,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="TRUE"/>
-
+  
     </values>
     <versions>
       <manual version="5.1"/>

@@ -11218,7 +11250,7 @@
     </versions>
   </option>
   <option command="mysqld" section="server" id="verbose">
-<!--checked-->
+  <!--checked-->
     <name>verbose</name>
     <shortdescription lang="en">Used with --help option for detailed help</shortdescription>
     <seealso xref="help"/>

@@ -11254,16 +11286,16 @@
     <xrefto id="option_mysqld_wait_timeout"/>
     <name>wait_timeout</name>
     <shortdescription lang="en">The number of seconds the server waits for activity on a connection
-      before closing it</shortdescription>
+        before closing it</shortdescription>
     <types>
       <optype class="cmdline" format="--wait_timeout=#" setvar="wait_timeout"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="system" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="28800"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11296,9 +11328,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11314,9 +11346,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="string" platform="all">
-
+  
       <value default="'d:t:o,/tmp/mysql.trace"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11329,7 +11361,7 @@
     <xrefto id="option_mysqld_Aborted_clients"/>
     <name>Aborted_clients</name>
     <shortdescription lang="en">The number of connections aborted because the client died without
-      closing the connection properly</shortdescription>
+        closing the connection properly</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -11385,7 +11417,7 @@
     <xrefto id="option_mysqld_version_comment"/>
     <name>version_comment</name>
     <shortdescription lang="en">This variable contains the value of the --with-comment option
-      specified when building MySQL</shortdescription>
+        specified when building MySQL</shortdescription>
     <types>
       <vartype isdynamic="no" scope="global" class="system"/>
     </types>

@@ -11443,18 +11475,18 @@
     </versions>
   </option>
   <option command="mysqld" section="ssl" id="ssl-verify-server-cert">
-<!--    <xrefto id="option_mysqld_ssl-verify-server-cert"/> -->
+  <!--    <xrefto id="option_mysqld_ssl-verify-server-cert"/> -->
     <name>ssl-verify-server-cert</name>
     <shortdescription lang="en">Causes the server's Common Name value in its certificate to be
-      verified against the hostname used when connecting to the server</shortdescription>
+        verified against the hostname used when connecting to the server</shortdescription>
     <types>
       <optype class="cmdline" format="--ssl-verify-server-cert"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="OFF"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -11493,7 +11525,7 @@
     </versions>
   </option>
   <option command="mysqld" section="server" id="have_partition_engine">
-<!--    <xrefto id="option_mysqld_have_partition_engine"/> -->
+  <!--    <xrefto id="option_mysqld_have_partition_engine"/> -->
     <name>have_partition_engine</name>
     <shortdescription lang="en">Whether mysqld supports partitioning</shortdescription>
     <deprecated version="5.1.6" xref="have_partitioning"/>

@@ -11506,8 +11538,8 @@
     </versions>
   </option>
   <option command="mysqld" section="bdb" id="bdb-data-direct">
-<!-- incomplete 
-    <xrefto id="option_mysqld_bdb-data-direct"/> -->
+  <!-- incomplete 
+      <xrefto id="option_mysqld_bdb-data-direct"/> -->
     <name>bdb-data-direct</name>
     <shortdescription lang="en">bdb-data-direct</shortdescription>
     <types>

@@ -11519,8 +11551,8 @@
     </versions>
   </option>
   <option command="mysqld" section="bdb" id="bdb-log-direct">
-<!-- incomplete
-    <xrefto id="option_mysqld_bdb-log-direct"/> -->
+  <!-- incomplete
+      <xrefto id="option_mysqld_bdb-log-direct"/> -->
     <name>bdb-log-direct</name>
     <shortdescription lang="en">bdb-log-direct</shortdescription>
     <types>

@@ -11675,7 +11707,7 @@
     </versions>
   </option>
   <option command="mysqld" section="innodb" id="have_innodb">
-<!-- what is this in 5.1.8 -->
+  <!-- what is this in 5.1.8 -->
     <xrefto id="option_mysqld_have_innodb"/>
     <name>have_innodb</name>
     <shortdescription lang="en">Whether mysqld supports InnoDB tables</shortdescription>

@@ -11740,7 +11772,7 @@
     <xrefto id="option_mysqld_have_rtree_keys"/>
     <name>have_rtree_keys</name>
     <shortdescription lang="en">YES if RTREE indexes are available, NO if not. (These are used for
-      spatial indexes in MyISAM tables.)</shortdescription>
+        spatial indexes in MyISAM tables.)</shortdescription>
     <types>
       <vartype isdynamic="no" class="system" scope="global"/>
     </types>

@@ -11769,7 +11801,7 @@
     </versions>
   </option>
   <option command="mysqld" section="server" id="skip-safemalloc">
-<!--    <xrefto id="option_mysqld_skip-safe-malloc"/> -->
+  <!--    <xrefto id="option_mysqld_skip-safe-malloc"/> -->
     <name>skip-safe-malloc</name>
     <shortdescription lang="en">Don't check for memory overruns during each memory allocation</shortdescription>
     <types>

@@ -11784,7 +11816,7 @@
     </versions>
   </option>
   <option command="mysqld" section="ssl" id="skip-ssl">
-<!--    <xrefto id="option_mysqld_skip-ssl"/> -->
+  <!--    <xrefto id="option_mysqld_skip-ssl"/> -->
     <name>skip-ssl</name>
     <shortdescription lang="en">Don't use ssl</shortdescription>
     <types>

@@ -11834,15 +11866,15 @@
     <xrefto id="option_mysqld_ndb_index_stat_cache_entries"/>
     <name>ndb_index_stat_cache_entries</name>
     <shortdescription lang="en">Sets the granularity of the statistics by determining the number of
-      starting and ending keys</shortdescription>
+        starting and ending keys</shortdescription>
     <types>
       <optype class="cmdline" format="--ndb_index_stat_cache_entries"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="32"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11860,9 +11892,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="ON"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11880,9 +11912,9 @@
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="20"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11895,20 +11927,20 @@
     <xrefto id="option_mysqld_ndb_optimized_node_selection"/>
     <name>ndb_optimize_node_selection</name>
     <shortdescription lang="en">Determines how an SQL node chooses a
-      cluster data node to use as transaction coordinator</shortdescription>
+        cluster data node to use as transaction coordinator</shortdescription>
     <types>
       <optype class="cmdline" format="--ndb-optimized-node-selection"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all" inversion="4.1.9">
-
+  
       <value default="ON"/>
-
+  
     </values>
     <values vartype="numeric" platform="all" inversion="5.1.22-ndb-6.3.4">
-
+  
       <value minimum="0" maximum="3" default="1"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11922,15 +11954,15 @@
     <xrefto id="option_mysqld_ndb_report_thresh_binlog_epoch_slip"/>
     <name>ndb_report_thresh_binlog_epoch_slip</name>
     <shortdescription lang="en">This is a threshold on the number of epochs to be behind before
-      reporting binlog status</shortdescription>
+        reporting binlog status</shortdescription>
     <types>
       <optype class="cmdline" format="--ndb_report_thresh_binlog_epoch_slip"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="3"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11943,15 +11975,15 @@
     <xrefto id="option_mysqld_ndb_report_thresh_binlog_mem_usage"/>
     <name>ndb_report_thresh_binlog_mem_usage</name>
     <shortdescription lang="en">This is a threshold on the percentage of free memory remaining
-      before reporting binlog status</shortdescription>
+        before reporting binlog status</shortdescription>
     <types>
       <optype class="cmdline" format="--ndb_report_thresh_binlog_mem_usage"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="10"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -11964,15 +11996,15 @@
     <xrefto id="option_mysqld_ndb_use_transactions"/>
     <name>ndb_use_transactions</name>
     <shortdescription lang="en">Forces NDB to use a count of records during SELECT COUNT(*) query
-      planning to speed up this type of query</shortdescription>
+        planning to speed up this type of query</shortdescription>
     <types>
       <optype class="cmdline" format="--ndb_use_transactions"/>
       <optype class="mycnf"/>
     </types>
     <values vartype="boolean" platform="all">
-
+  
       <value default="ON"/>
-
+  
     </values>
     <versions>
       <manual version="4.1"/>

@@ -12095,7 +12127,7 @@
     <xrefto id="option_mysqld_Innodb_buffer_pool_pages_misc"/>
     <name>Innodb_buffer_pool_pages_misc</name>
     <shortdescription lang="en">The number of pages that are busy because they have been allocated
-      for administrative overhead</shortdescription>
+        for administrative overhead</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -12171,7 +12203,7 @@
     <xrefto id="option_mysqld_Innodb_buffer_pool_reads"/>
     <name>Innodb_buffer_pool_reads</name>
     <shortdescription lang="en">The number of logical reads that InnoDB could not satisfy from the
-      buffer pool and had to do a single-page read</shortdescription>
+        buffer pool and had to do a single-page read</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -12334,7 +12366,7 @@
     </versions>
   </option>
   <option command="mysqld" section="innodb" id="Innodb_dblwr_writes">
-<!--    <xrefto id="option_mysqld_Innodb_dblwr_writes"/> -->
+  <!--    <xrefto id="option_mysqld_Innodb_dblwr_writes"/> -->
     <name>Innodb_dblwr_writes</name>
     <shortdescription lang="en">The number of doublewrite operations that have been performed</shortdescription>
     <types>

@@ -12349,7 +12381,7 @@
     </versions>
   </option>
   <option command="mysqld" section="innodb" id="Innodb_dblwr_pages_written">
-<!--    <xrefto id="option_mysqld_Innodb_dblwr_pages_written"/> -->
+  <!--    <xrefto id="option_mysqld_Innodb_dblwr_pages_written"/> -->
     <name>Innodb_dblwr_pages_written</name>
     <shortdescription lang="en">The number of doublewrite pages that have been written</shortdescription>
     <types>

@@ -12367,7 +12399,7 @@
     <xrefto id="option_mysqld_Innodb_log_waits"/>
     <name>Innodb_log_waits</name>
     <shortdescription lang="en">The number of times that the log buffer was too small and a wait was
-      required for it to be flushed before continuing</shortdescription>
+        required for it to be flushed before continuing</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>

@@ -12668,14 +12700,14 @@
     <xrefto id="option_mysqld_Ndb_cluster_node_id"/>
     <name>Ndb_cluster_node_id</name>
     <shortdescription lang="en">If the server is acting as a MySQL Cluster node, then the value of
-      this variable its node ID in the cluster</shortdescription>
+        this variable its node ID in the cluster</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -12687,14 +12719,14 @@
     <xrefto id="option_mysqld_Ndb_config_from_host"/>
     <name>Ndb_config_from_host</name>
     <shortdescription lang="en">The hostname or IP address of the Cluster management server.
-      Formerly Ndb_connected_host</shortdescription>
+        Formerly Ndb_connected_host</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -12708,14 +12740,14 @@
     <xrefto id="option_mysqld_Ndb_config_from_port"/>
     <name>Ndb_config_from_port</name>
     <shortdescription lang="en">The port for connecting to the Cluster management server. Formerly,
-      Ndb_connected_port</shortdescription>
+        Ndb_connected_port</shortdescription>
     <types>
       <vartype isdynamic="no" class="status" scope="both"/>
     </types>
     <values vartype="numeric" platform="all">
-
+  
       <value default="0"/>
-
+  
     </values>
     <versions>
       <manual version="5.0"/>

@@ -12760,7 +12792,7 @@
     <xrefto id="option_mysqld_old"/>
     <name>old</name>
     <shortdescription lang="en">Cause the server to revert to certain behaviors present in older
-      versions</shortdescription>
+        versions</shortdescription>
     <types>
       <optype class="cmdline" format="old"/>
       <optype class="mycnf"/>

@@ -12791,7 +12823,7 @@
     <xrefto id="option_mysqld_lower_case_file_system"/>
     <name>lower_case_file_system</name>
     <shortdescription lang="en"> This variable describes the case sensitivity of filenames on the
-      file system </shortdescription>
+        file system </shortdescription>
     <types>
       <optype class="cmdline" format="--lower_case_file_system[=#]" setvar="lower_case_file_system"/>
       <optype class="mycnf"/>

@@ -12836,5 +12868,7 @@
       <manual version="5.2"/>
     </versions>
   </option>
-
+  
+  
+  
 </options>


Modified: trunk/refman-5.1/dba-core.xml
===================================================================
--- trunk/refman-5.1/dba-core.xml	2007-10-24 10:59:02 UTC (rev 8286)
+++ trunk/refman-5.1/dba-core.xml	2007-10-24 12:30:17 UTC (rev 8287)
Changed blocks: 3, Lines Added: 42, Lines Deleted: 4; 2438 bytes

@@ -10093,6 +10093,24 @@
           </listitem>
 
           <listitem>
+            
+            &mccge-warning-begin;
+            
+            <para id="option_mysqld_Slave_heartbeat_period">
+              <literal>Slave_heartbeat_period</literal>
+            </para>
+
+            <para>
+              Shows the replication heartbeat interval (in seconds) on a
+              replication slave. This variable was added in MySQL
+              5.1.22-ndb-6.3.4.
+            </para>
+            
+            &mccge-warning-end-all;
+            
+          </listitem>
+
+          <listitem>
             <para id="option_mysqld_Slave_open_temp_tables">
               <literal>Slave_open_temp_tables</literal>
             </para>

@@ -10104,14 +10122,23 @@
           </listitem>
 
           <listitem>
-            <para id="option_mysqld_Slave_running">
-              <literal>Slave_running</literal>
+            
+            &mccge-warning-begin;
+            
+            <para id="option_mysqld_Slave_received_heartbeats">
+              <literal>Slave_received_heartbeats</literal>
             </para>
 
             <para>
-              This is <literal>ON</literal> if this server is a slave
-              that is connected to a master.
+              This counter increments with each replication heartbeat
+              received by a replication slave since the last time that
+              the slave was restarted or reset, or a <literal>CHANGE
+              MASTER</literal> statement was issued. This variable was
+              added in MySQL 5.1.22-ndb-6.3.4.
             </para>
+            
+            &mccge-warning-end-all;
+            
           </listitem>
 
           <listitem>

@@ -10126,6 +10153,17 @@
           </listitem>
 
           <listitem>
+            <para id="option_mysqld_Slave_running">
+              <literal>Slave_running</literal>
+            </para>
+
+            <para>
+              This is <literal>ON</literal> if this server is a slave
+              that is connected to a master.
+            </para>
+          </listitem>
+
+          <listitem>
             <para id="option_mysqld_Slow_launch_threads">
               <literal>Slow_launch_threads</literal>
             </para>


Modified: trunk/refman-5.1/mysql-cluster-cge.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-cge.xml	2007-10-24 10:59:02 UTC (rev 8286)
+++ trunk/refman-5.1/mysql-cluster-cge.xml	2007-10-24 12:30:17 UTC (rev 8287)
Changed blocks: 1, Lines Added: 19, Lines Deleted: 3; 1667 bytes

@@ -631,12 +631,28 @@
               specify the network interface to use for connecting to the
               master by a replication slave having multiple network
               addresses. This can also be set at run time using the
-              <literal>MASTER_BIND='<replaceable>interface</replaceable>'</literal>
-              clause in a <literal>CHANGE MASTER TO</literal>
-              statement.(MySQL 5.1.22-ndb-6.3.4)
+              <literal>MASTER_BIND =
+              '<replaceable>interface</replaceable>'</literal> clause in
+              a <literal>CHANGE MASTER TO</literal> statement.(MySQL
+              5.1.22-ndb-6.3.4)
             </para>
           </listitem>
 
+          <listitem>
+            <para>
+              Replication heartbeats facilitate the task of monitoring
+              and detecting failures in master-slave connections in real
+              time. This feature is implemented via a new
+              <literal>MASTER_HEARTBEAT_PERIOD =
+              <replaceable>value</replaceable></literal> clause for the
+              <literal>CHANGE MASTER TO</literal> statement and the
+              addition of two status variables
+              <literal>Slave_heartbeat_period</literal> and
+              <literal>Slave_received_heartbeats</literal>. (MySQL
+              5.1.22-ndb-6.3.4)
+            </para>
+          </listitem>
+
         </itemizedlist>
       </para>
 


Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2007-10-24 10:59:02 UTC (rev 8286)
+++ trunk/refman-5.1/sql-syntax.xml	2007-10-24 12:30:17 UTC (rev 8287)
Changed blocks: 3, Lines Added: 50, Lines Deleted: 7; 3624 bytes

@@ -24603,10 +24603,11 @@
         <remark role="help-topic" condition="CHANGE MASTER TO"/>
 
         <remark role="help-keywords">
-          CHANGE MASTER TO MASTER_BIND MASTER_HOST MASTER_USER
-          MASTER_PASSWORD MASTER_PORT MASTER_LOG_FILE MASTER_LOG_POS
-          MASTER_CONNECT_RETRY RELAY_LOG_POS RELAY_LOG_FILE MASTER_SSL
-          MASTER_SSL_CA MASTER_SSL_CERT MASTER_SSL_KEY MASTER_SSL_CIPHER
+          CHANGE MASTER TO MASTER_BIND MASTER_HEARTBEAT_PERIOD
+          MASTER_HOST MASTER_USER MASTER_PASSWORD MASTER_PORT
+          MASTER_LOG_FILE MASTER_LOG_POS MASTER_CONNECT_RETRY
+          RELAY_LOG_POS RELAY_LOG_FILE MASTER_SSL MASTER_SSL_CA
+          MASTER_SSL_CERT MASTER_SSL_KEY MASTER_SSL_CIPHER
           MASTER_SSL_VERIFY_SERVER_CERT
         </remark>
 

@@ -24622,6 +24623,7 @@
   | MASTER_PASSWORD = '<replaceable>password</replaceable>'
   | MASTER_PORT = <replaceable>port_num</replaceable>
   | MASTER_CONNECT_RETRY = <replaceable>count</replaceable>
+  | MASTER_HEARTBEAT_PERIOD = <replaceable>interval</replaceable>
   | MASTER_LOG_FILE = '<replaceable>master_log_name</replaceable>'
   | MASTER_LOG_POS = <replaceable>master_log_pos</replaceable>
   | RELAY_LOG_FILE = '<replaceable>relay_log_name</replaceable>'

@@ -24713,10 +24715,51 @@
           connecting to the master. It is also possible to determine
           which network interface is to be used in such cases by
           starting the slave mysqld process with the
-          <option>--master-bind</option> option. This ability to bind a
-          replication slave to specific network interface was added in
-          MySQL 5.1.22-ndb-6.3.4.
+          <option>--master-bind</option> option.
         </para>
+
+        <para>
+          The ability to bind a replication slave to specific network
+          interface was added in MySQL 5.1.22-ndb-6.3.4.
+        </para>
+
+        <para>
+          <literal>MASTER_HEARTBEAT_PERIOD</literal> is used to set the
+          interval in seconds between replication heartbeats. Whenever
+          the master&apos;s binlog is updated with an event, the waiting
+          period for the next heartbeat is reset.
+          <replaceable>interval</replaceable> is a decimal value having
+          the range 0 to 4294967 seconds and a resolution to hundredths
+          of a second; the smallest nonzero value is 0.001. Heartbeats
+          are sent by the master only if there are no unsent events in
+          the binlog file for a period longer than
+          <replaceable>interval</replaceable>.
+        </para>
+
+        <para>
+          Setting <replaceable>interval</replaceable> to 0 disables
+          heartbeats altogether. The default value for
+          <replaceable>interval</replaceable> is equal to the value of
+          <literal>slave_net_timeout</literal> divided by 2.
+        </para>
+
+        <note>
+          <para>
+            Setting <literal>@@global.slave_net_timeout</literal> to a
+            value less than that of the current heartbeat interval
+            results in a warning being issued.
+          </para>
+        </note>
+
+        <para>
+          Issuing <literal>RESET SLAVE</literal> resets the hearbeat
+          interval to the default.
+        </para>
+
+        <para>
+          <literal>MASTER_HEARTBEAT_PERIOD</literal> was added in MySQL
+          5.1.22-ndb-6.3.4.
+        </para>
         
         &mccge-warning-end-all;
 


Modified: trunk/refman-5.2/dba-core.xml
===================================================================
--- trunk/refman-5.2/dba-core.xml	2007-10-24 10:59:02 UTC (rev 8286)
+++ trunk/refman-5.2/dba-core.xml	2007-10-24 12:30:17 UTC (rev 8287)
Changed blocks: 3, Lines Added: 28, Lines Deleted: 4; 2037 bytes

@@ -9926,6 +9926,17 @@
           </listitem>
 
           <listitem>
+            <para id="option_mysqld_Slave_heartbeat_period">
+              <literal>Slave_heartbeat_period</literal>
+            </para>
+
+            <para>
+              Shows the replication heartbeat interval (in seconds) on a
+              replication slave.
+            </para>
+          </listitem>
+
+          <listitem>
             <para id="option_mysqld_Slave_open_temp_tables">
               <literal>Slave_open_temp_tables</literal>
             </para>

@@ -9937,13 +9948,15 @@
           </listitem>
 
           <listitem>
-            <para id="option_mysqld_Slave_running">
-              <literal>Slave_running</literal>
+            <para id="option_mysqld_Slave_received_heartbeats">
+              <literal>Slave_received_heartbeats</literal>
             </para>
 
             <para>
-              This is <literal>ON</literal> if this server is a slave
-              that is connected to a master.
+              This counter increments with each replication heartbeat
+              received by a replication slave since the last time that
+              the slave was restarted or reset, or a <literal>CHANGE
+              MASTER</literal> statement was issued.
             </para>
           </listitem>
 

@@ -9959,6 +9972,17 @@
           </listitem>
 
           <listitem>
+            <para id="option_mysqld_Slave_running">
+              <literal>Slave_running</literal>
+            </para>
+
+            <para>
+              This is <literal>ON</literal> if this server is a slave
+              that is connected to a master.
+            </para>
+          </listitem>
+
+          <listitem>
             <para id="option_mysqld_Slow_launch_threads">
               <literal>Slow_launch_threads</literal>
             </para>


Modified: trunk/refman-5.2/sql-syntax.xml
===================================================================
--- trunk/refman-5.2/sql-syntax.xml	2007-10-24 10:59:02 UTC (rev 8286)
+++ trunk/refman-5.2/sql-syntax.xml	2007-10-24 12:30:17 UTC (rev 8287)
Changed blocks: 4, Lines Added: 41, Lines Deleted: 8; 3797 bytes

@@ -24879,10 +24879,11 @@
         <remark role="help-topic" condition="CHANGE MASTER TO"/>
 
         <remark role="help-keywords">
-          CHANGE MASTER TO MASTER_BIND MASTER_HOST MASTER_USER 
-          MASTER_PASSWORD MASTER_PORT MASTER_LOG_FILE MASTER_LOG_POS
-          MASTER_CONNECT_RETRY RELAY_LOG_POS RELAY_LOG_FILE MASTER_SSL
-          MASTER_SSL_CA MASTER_SSL_CERT MASTER_SSL_KEY MASTER_SSL_CIPHER
+          CHANGE MASTER TO MASTER_BIND MASTER_HEARTBEAT_PERIOD
+          MASTER_HOST MASTER_USER MASTER_PASSWORD MASTER_PORT
+          MASTER_LOG_FILE MASTER_LOG_POS MASTER_CONNECT_RETRY
+          RELAY_LOG_POS RELAY_LOG_FILE MASTER_SSL MASTER_SSL_CA
+          MASTER_SSL_CERT MASTER_SSL_KEY MASTER_SSL_CIPHER
           MASTER_SSL_VERIFY_SERVER_CERT
         </remark>
 

@@ -24898,6 +24899,7 @@
   | MASTER_PASSWORD = '<replaceable>password</replaceable>'
   | MASTER_PORT = <replaceable>port_num</replaceable>
   | MASTER_CONNECT_RETRY = <replaceable>count</replaceable>
+  | MASTER_HEARTBEAT_PERIOD = <replaceable>interval</replaceable>
   | MASTER_LOG_FILE = '<replaceable>master_log_name</replaceable>'
   | MASTER_LOG_POS = <replaceable>master_log_pos</replaceable>
   | RELAY_LOG_FILE = '<replaceable>relay_log_name</replaceable>'

@@ -24979,7 +24981,7 @@
           <literal>localhost</literal>, then, like in other parts of
           MySQL, the port number might be ignored.
         </para>
-        
+
         <para>
           <literal>MASTER_BIND</literal> is for use on replication
           slaves having multiple network interfaces, and determines

@@ -24987,13 +24989,44 @@
           connecting to the master. It is also possible to determine
           which network interface is to be used in such cases by
           starting the slave mysqld process with the
-          <option>--master-bind</option> option. This ability to bind a
-          replication slave to specific network interface was added in
-          MySQL 5.1.22-ndb-6.3.4.
+          <option>--master-bind</option> option.
         </para>
 
+        <para>
+          <literal>MASTER_HEARTBEAT_PERIOD</literal> is used to set the
+          interval in seconds between replication heartbeats. Whenever
+          the master&apos;s binlog is updated with an event, the waiting
+          period for the next heartbeat is reset.
+          <replaceable>interval</replaceable> is a decimal value having
+          the range 0 to 4294967 seconds and a resolution to hundredths
+          of a second; the smallest nonzero value is 0.001. Heartbeats
+          are sent by the master only if there are no unsent events in
+          the binlog file for a period longer than
+          <replaceable>interval</replaceable>.
+        </para>
+
+        <para>
+          Setting <replaceable>interval</replaceable> to 0 disables
+          heartbeats altogether. The default value for
+          <replaceable>interval</replaceable> is equal to the value of
+          <literal>slave_net_timeout</literal> divided by 2.
+        </para>
+
         <note>
           <para>
+            Setting <literal>@@global.slave_net_timeout</literal> to a
+            value less than that of the current heartbeat interval
+            results in a warning being issued.
+          </para>
+        </note>
+
+        <para>
+          Issuing <literal>RESET SLAVE</literal> resets the hearbeat
+          interval to the default.
+        </para>
+
+        <note>
+          <para>
             Replication cannot use Unix socket files. You must be able
             to connect to the master MySQL server using TCP/IP.
           </para>


Thread
svn commit - mysqldoc@docsrva: r8287 - in trunk: dynamic-docs/changelog dynamic-docs/command-optvars refman-5.1 refman-5.2jon24 Oct