List:Commits« Previous MessageNext Message »
From:jon Date:March 12 2007 1:45pm
Subject:svn commit - mysqldoc@docsrva: r5303 - in branches/telcos: mysqld-optvars refman-5.1
View as plain text  
Author: jstephens
Date: 2007-03-12 14:45:24 +0100 (Mon, 12 Mar 2007)
New Revision: 5303

Log:

Reformat.



Modified:
   branches/telcos/mysqld-optvars/options.xml
   branches/telcos/refman-5.1/database-administration.xml
   branches/telcos/refman-5.1/news-5.1.xml


Modified: branches/telcos/mysqld-optvars/options.xml
===================================================================
--- branches/telcos/mysqld-optvars/options.xml	2007-03-12 13:42:08 UTC (rev 5302)
+++ branches/telcos/mysqld-optvars/options.xml	2007-03-12 13:45:24 UTC (rev 5303)
Changed blocks: 300, Lines Added: 710, Lines Deleted: 595; 143034 bytes

@@ -3,8 +3,8 @@
   <mysqloption id="Aborted_connects">
     <xrefto id="optvar_Aborted_connects"/>
     <name>Aborted_connects</name>
-    <shortdescription lang="en">The number of failed attempts to connecto the
-      MySQL server</shortdescription>
+    <shortdescription lang="en">The number of failed attempts to
+      connecto the MySQL server</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -20,8 +20,8 @@
   <mysqloption id="Binlog_cache_disk_use">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">The number of transactions that used a
+      temporary file instead of the temporary binary log cache</shortdescription>
     <section id="mysqld"/>
     <opclass class="binlog"/>
     <engines includes="all"/>

@@ -41,12 +41,15 @@
       supported.</shortdescription>
     <opclass class="replication"/>
     <deprecated version="5.1.15"/>
-    <types><vartype isdynamic="no" class="status" scope="global"/></types>
-    <versions><manual version="5.1"/>
-    <introduced version="5.1.5"/>
+    <types>
+      <vartype isdynamic="no" class="status" scope="global"/>
+    </types>
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.5"/>
     </versions>
   </mysqloption>
-  
+
   <mysqloption id="Binlog_cache_use">
     <xrefto id="optvar_Binlog_cache_use"/>
     <name>Binlog_cache_use</name>

@@ -2385,7 +2388,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="Open_table_definitions">
-    
+
     <name>Open_table_definitions</name>
     <shortdescription lang="en">Open table definitions</shortdescription>
     <section id="mysqld"/>

@@ -2977,10 +2980,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="abort-slave-event-count">
-    
+
     <name>abort-slave-event-count</name>
-    <shortdescription lang="en">Option used by mysql-test for debugging and
-      testing of replication</shortdescription>
+    <shortdescription lang="en">Option used by mysql-test for debugging
+      and testing of replication</shortdescription>
     <section id="replication"/>
     <opclass class="replication"/>
     <engines includes="all"/>

@@ -3002,8 +3005,8 @@
   <mysqloption id="allow-suspicious-udfs">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Allows use of UDFs consisting of only
+      one symbol xxx() without corresponding xxx_init() or xxx_deinit()</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -3025,7 +3028,8 @@
   <mysqloption id="ansi">
     <xrefto id="optvar_ansi"/>
     <name>ansi</name>
-    <shortdescription lang="en">Use ANSI SQL syntax instead of MySQL syntax. </shortdescription>
+    <shortdescription lang="en">Use ANSI SQL syntax instead of MySQL
+      syntax. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -3046,8 +3050,8 @@
   <mysqloption id="auto-increment-increment">
     <xrefto id="optvar_auto-increment-increment"/>
     <name>auto-increment-increment</name>
-    <shortdescription lang="en">Auto-increment columns are incremented by this
-      value</shortdescription>
+    <shortdescription lang="en">Auto-increment columns are incremented
+      by this value</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -3091,7 +3095,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="autocommit">
-    
+
     <name>autocommit</name>
     <shortdescription lang="en">Sets the autocommit mode.</shortdescription>
     <section id="mysqld"/>

@@ -3109,10 +3113,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="automatic-sp-privileges">
-    
+
     <name>automatic-sp-privileges</name>
-    <shortdescription lang="en">Creating and dropping stored procedures alters
-      ACLs</shortdescription>
+    <shortdescription lang="en">Creating and dropping stored procedures
+      alters ACLs</shortdescription>
     <section id="mysqld"/>
     <opclass class="security"/>
     <engines includes="all"/>

@@ -3135,8 +3139,8 @@
   <mysqloption id="back_log">
     <xrefto id="optvar_back_log"/>
     <name>back_log</name>
-    <shortdescription lang="en">The number of outstanding connection requests
-      MySQL can have. </shortdescription>
+    <shortdescription lang="en">The number of outstanding connection
+      requests MySQL can have. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -3158,8 +3162,8 @@
   <mysqloption id="basedir">
     <xrefto id="optvar_basedir"/>
     <name>basedir</name>
-    <shortdescription lang="en">Path to installation directory. All paths are
-      usually resolved relative to this</shortdescription>
+    <shortdescription lang="en">Path to installation directory. All
+      paths are usually resolved relative to this</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -3179,8 +3183,8 @@
   <mysqloption id="bdb">
     <xrefto id="optvar_skip-bdb"/>
     <name>bdb</name>
-    <shortdescription lang="en">Enable Berkeley DB (if this version of MySQL
-      supports it).</shortdescription>
+    <shortdescription lang="en">Enable Berkeley DB (if this version of
+      MySQL supports it).</shortdescription>
     <section id="mysqld"/>
     <opclass class="bdb"/>
     <engines>

@@ -3214,8 +3218,8 @@
     </engines>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--bdb-home=name" outversion="5.1.12"
-        setvar="bdb_home"/>
+      <optype class="cmdline" format="--bdb-home=name"
+        outversion="5.1.12" setvar="bdb_home"/>
       <optype class="mycnf"/>
       <vartype class="server" format="bdb_home" outversion="5.1.12"
         isdynamic="no"/>

@@ -3256,8 +3260,8 @@
     </engines>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--bdb-logdir=name" outversion="5.1.12"
-        setvar="bdb_logdir"/>
+      <optype class="cmdline" format="--bdb-logdir=name"
+        outversion="5.1.12" setvar="bdb_logdir"/>
       <optype class="mycnf"/>
       <vartype class="server" isdynamic="no" format="bdb_logdir"
         outversion="5.1.12"/>

@@ -3270,7 +3274,8 @@
   <mysqloption id="bdb-no-recover">
     <xrefto id="optvar_bdb-no-recover"/>
     <name>bdb-no-recover</name>
-    <shortdescription lang="en">Don't try to recover Berkeley DB tables on start</shortdescription>
+    <shortdescription lang="en">Don't try to recover Berkeley DB tables
+      on start</shortdescription>
     <section id="mysqld"/>
     <opclass class="bdb"/>
     <engines>

@@ -3278,7 +3283,8 @@
     </engines>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--bdb-no-recover" outversion="5.1.12"/>
+      <optype class="cmdline" format="--bdb-no-recover"
+        outversion="5.1.12"/>
       <optype class="mycnf"/>
     </types>
     <versions>

@@ -3317,11 +3323,11 @@
     </engines>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--bdb-shared-data" outversion="5.1.12"
-        setvar="bdb_shared_data"/>
+      <optype class="cmdline" format="--bdb-shared-data"
+        outversion="5.1.12" setvar="bdb_shared_data"/>
       <optype class="mycnf" format="bdb_shared_data"/>
-      <vartype class="server" format="bdb_shared_data" outversion="5.1.12"
-        isdynamic="no"/>
+      <vartype class="server" format="bdb_shared_data"
+        outversion="5.1.12" isdynamic="no"/>
     </types>
     <versions>
       <manual version="4.1"/>

@@ -3339,8 +3345,8 @@
     </engines>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--bdb-tmpdir=name" outversion="5.1.12"
-        setvar="bdb_tmpdir"/>
+      <optype class="cmdline" format="--bdb-tmpdir=name"
+        outversion="5.1.12" setvar="bdb_tmpdir"/>
       <optype class="mycnf" format="bdb_tmpdir" outversion="5.1.12"/>
       <vartype class="server" format="bdb_tmpdir" outversion="5.1.12"
         isdynamic="no"/>

@@ -3353,8 +3359,8 @@
   <mysqloption id="bdb_cache_size">
     <xrefto id="optvar_bdb_cache_size"/>
     <name>bdb_cache_size</name>
-    <shortdescription lang="en">The buffer that is allocated to cache index and
-      rows for BDB tables</shortdescription>
+    <shortdescription lang="en">The buffer that is allocated to cache
+      index and rows for BDB tables</shortdescription>
     <section id="mysqld"/>
     <opclass class="bdb"/>
     <engines>

@@ -3362,8 +3368,8 @@
     </engines>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--bdb_cache_size=#" outversion="5.1.12"
-        setvar="bdb_cache_size"/>
+      <optype class="cmdline" format="--bdb_cache_size=#"
+        outversion="5.1.12" setvar="bdb_cache_size"/>
       <optype class="mycnf" outversion="5.1.12"/>
       <vartype class="server" isdynamic="no" format="bdb_cache_size"
         outversion="5.1.12"/>

@@ -3385,8 +3391,8 @@
     <platforms applies="all"/>
     <seealso xref="bdb_max_lock"/>
     <types>
-      <optype class="cmdline" format="--bdb_lock_max=#" outversion="5.1.12"
-        setvar="bdb_lock_max"/>
+      <optype class="cmdline" format="--bdb_lock_max=#"
+        outversion="5.1.12" setvar="bdb_lock_max"/>
       <optype class="mycnf" outversion="5.1.12"/>
       <vartype class="server" isdynamic="no" outversion="5.1.12"/>
     </types>

@@ -3398,8 +3404,8 @@
   <mysqloption id="bdb_log_buffer_size">
     <xrefto id="optvar_bdb_log_buffer_size"/>
     <name>bdb_log_buffer_size</name>
-    <shortdescription lang="en">The buffer that is allocated to cache index and
-      rows for BDB tables</shortdescription>
+    <shortdescription lang="en">The buffer that is allocated to cache
+      index and rows for BDB tables</shortdescription>
     <section id="mysqld"/>
     <opclass class="bdb"/>
     <engines>

@@ -3420,8 +3426,8 @@
   <mysqloption id="bdb_max_lock">
     <xrefto id="optvar_bdb_max_lock"/>
     <name>bdb_max_lock</name>
-    <shortdescription lang="en">The maximum number of locks you can have active
-      on a BDB table</shortdescription>
+    <shortdescription lang="en">The maximum number of locks you can have
+      active on a BDB table</shortdescription>
     <section id="mysqld"/>
     <opclass class="bdb"/>
     <engines>

@@ -3429,8 +3435,8 @@
     </engines>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--bdb_max_lock=#" setvar="bdb_max_lock"
-        outversion="5.1.12"/>
+      <optype class="cmdline" format="--bdb_max_lock=#"
+        setvar="bdb_max_lock" outversion="5.1.12"/>
       <optype class="mycnf" outversion="5.1.12"/>
       <vartype class="server" isdynamic="no" outversion="5.1.12"/>
     </types>

@@ -3442,8 +3448,8 @@
   <mysqloption id="big-tables">
     <xrefto id="optvar_big-tables"/>
     <name>big-tables</name>
-    <shortdescription lang="en">Allow big result sets by saving all temporary
-      sets on file</shortdescription>
+    <shortdescription lang="en">Allow big result sets by saving all
+      temporary sets on file</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -3467,7 +3473,8 @@
     <section id="mysqld"/>
     <opclass class="server"/>
     <types>
-      <optype class="cmdline" format="--bind-address=name" setvar="bind-address"/>
+      <optype class="cmdline" format="--bind-address=name"
+        setvar="bind-address"/>
       <optype class="mycnf"/>
       <vartype class="server" isdynamic="no"/>
     </types>

@@ -3480,7 +3487,8 @@
   <mysqloption id="binlog-do-db">
     <xrefto id="optvar_binlog-do-db"/>
     <name>binlog-do-db</name>
-    <shortdescription lang="en">Limits binary logging to specific databases</shortdescription>
+    <shortdescription lang="en">Limits binary logging to specific
+      databases</shortdescription>
     <section id="mysqld"/>
     <opclass class="binlog"/>
     <engines includes="all"/>

@@ -3498,8 +3506,8 @@
   <mysqloption id="binlog-ignore-db">
     <xrefto id="optvar_binlog-ignore-db"/>
     <name>binlog-ignore-db</name>
-    <shortdescription lang="en">Tells the master that updates to the given
-      database should not be logged tothe binary log</shortdescription>
+    <shortdescription lang="en">Tells the master that updates to the
+      given database should not be logged tothe binary log</shortdescription>
     <section id="mysqld"/>
     <opclass class="binlog"/>
     <engines includes="all"/>

@@ -3534,8 +3542,8 @@
   <mysqloption id="binlog_cache_size">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">The size of the cache to hold the SQL
+      statements for the binary log during a transaction. </shortdescription>
     <section id="mysqld"/>
     <opclass class="binlog"/>
     <engines includes="all"/>

@@ -3565,9 +3573,11 @@
     <seealso xref="log-bin-trust-function-creators"/>
     <seealso xref="innodb_locks_unsafe_for_binlog"/>
     <types>
-      <optype class="mycnf" format="binlog-format" setvar="binlog_format"/>
+      <optype class="mycnf" format="binlog-format"
+        setvar="binlog_format"/>
       <vartype class="server" isdynamic="yes" scope="both"/>
-      <optype class="cmdline" format="--binlog-format" setvar="binlog_format"/>
+      <optype class="cmdline" format="--binlog-format"
+        setvar="binlog_format"/>
     </types>
     <values vartype="string" platform="all">
       <value default="row"/>

@@ -3622,8 +3632,8 @@
   <mysqloption id="character-set-client-handshake">
     <xrefto id="optvar_character-set-client-handshake"/>
     <name>character-set-client-handshake</name>
-    <shortdescription lang="en">Don't ignore client side character set value
-      sent during handshake</shortdescription>
+    <shortdescription lang="en">Don't ignore client side character set
+      value sent during handshake</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -3651,8 +3661,8 @@
       <optype class="cmdline" format="--character-set-filesystem=name"
         setvar="character-set-filesystem"/>
       <optype class="mycnf"/>
-      <vartype class="server" format="character_set_filesystem" isdynamic="yes"
-      />
+      <vartype class="server" format="character_set_filesystem"
+        isdynamic="yes"/>
     </types>
     <values vartype="string" platform="all"/>
     <versions>

@@ -3663,8 +3673,8 @@
   <mysqloption id="character-set-server">
     <xrefto id="optvar_character-set-server"/>
     <name>character-set-server</name>
-    <shortdescription lang="en">instead). --default-collation=name Set the
-      default collation (deprecated option, use</shortdescription>
+    <shortdescription lang="en">instead). --default-collation=name Set
+      the default collation (deprecated option, use</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -3673,7 +3683,8 @@
       <optype class="cmdline" format="--character-set-server"
         setvar="character_set_server"/>
       <optype class="mycnf"/>
-      <vartype class="server" format="character_set_server" isdynamic="yes"/>
+      <vartype class="server" format="character_set_server"
+        isdynamic="yes"/>
     </types>
     <versions>
       <manual version="4.1"/>

@@ -3693,7 +3704,8 @@
       <optype class="cmdline" format="--character-sets-dir=name"
         setvar="character-sets-dir"/>
       <optype class="mycnf"/>
-      <vartype class="server" format="character_sets_dir" isdynamic="no"/>
+      <vartype class="server" format="character_sets_dir" isdynamic="no"
+      />
     </types>
     <versions>
       <manual version="4.1"/>

@@ -3787,7 +3799,8 @@
       <optype class="cmdline" format="--collation-server"
         setvar="collation_server"/>
       <optype class="mycnf"/>
-      <vartype class="server" format="collation_server" isdynamic="yes"/>
+      <vartype class="server" format="collation_server" isdynamic="yes"
+      />
     </types>
     <versions>
       <manual version="4.1"/>

@@ -3841,8 +3854,9 @@
   <mysqloption id="connect_timeout">
     <xrefto id="optvar_connect_timeout"/>
     <name>connect_timeout</name>
-    <shortdescription lang="en">The number of seconds the mysqld server is
-      waiting for a connect packet before responding with 'Bad handshake'</shortdescription>
+    <shortdescription lang="en">The number of seconds the mysqld server
+      is waiting for a connect packet before responding with 'Bad
+      handshake'</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -3864,8 +3878,8 @@
   <mysqloption id="console">
     <xrefto id="optvar_console"/>
     <name>console</name>
-    <shortdescription lang="en">Write error output on screen; Don't remove the
-      console window on windows</shortdescription>
+    <shortdescription lang="en">Write error output on screen; Don't
+      remove the console window on windows</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -3901,8 +3915,8 @@
   <mysqloption id="crash_binlog_innodb">
     <xrefto id="optvar_crash_binlog_innodb"/>
     <name>crash_binlog_innodb</name>
-    <shortdescription lang="en">Used only for testing, to crash when writing Nth
-      event to binlog</shortdescription>
+    <shortdescription lang="en">Used only for testing, to crash when
+      writing Nth event to binlog</shortdescription>
     <section id="mysqld"/>
     <opclass class="innodb"/>
     <engines includes="all"/>

@@ -3945,7 +3959,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--date_format=name" setvar="date_format"/>
+      <optype class="cmdline" format="--date_format=name"
+        setvar="date_format"/>
       <vartype isdynamic="yes" class="server"/>
     </types>
     <versions>

@@ -3957,7 +3972,8 @@
   <mysqloption id="datetime_format">
     <xrefto id="optvar_datetime_format"/>
     <name>datetime_format</name>
-    <shortdescription lang="en">The DATETIME/TIMESTAMP format (for future)</shortdescription>
+    <shortdescription lang="en">The DATETIME/TIMESTAMP format (for
+      future)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4006,7 +4022,8 @@
     <types>
       <optype class="cmdline" format="--default-collation=name"
         setvar="default-collation"/>
-      <vartype isdynamic="yes" class="server" format="default_collation"/>
+      <vartype isdynamic="yes" class="server" format="default_collation"
+      />
     </types>
     <versions>
       <manual version="4.1"/>

@@ -4017,8 +4034,8 @@
   <mysqloption id="default-storage-engine">
     <xrefto id="optvar_default-storage-engine"/>
     <name>default-storage-engine</name>
-    <shortdescription lang="en">Set the default storage engine (table type) for
-      tables</shortdescription>
+    <shortdescription lang="en">Set the default storage engine (table
+      type) for tables</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4074,7 +4091,8 @@
   <mysqloption id="default_week_format">
     <xrefto id="optvar_default_week_format"/>
     <name>default_week_format</name>
-    <shortdescription lang="en">The default week format used by WEEK() functions</shortdescription>
+    <shortdescription lang="en">The default week format used by WEEK()
+      functions</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4150,17 +4168,18 @@
     </versions>
   </mysqloption>
   <mysqloption id="delay-key-write-for-all-tables">
-    
+
     <name>delay-key-write-for-all-tables</name>
-    <shortdescription lang="en">Don't flush key buffers between writes for any
-      MyISAM table</shortdescription>
+    <shortdescription lang="en">Don't flush key buffers between writes
+      for any MyISAM table</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <deprecated version="5.0" xref="delay-key-write"/>
     <types>
-      <optype class="cmdline" format="--delay-key-write-for-all-tables"/>
+      <optype class="cmdline" format="--delay-key-write-for-all-tables"
+      />
     </types>
     <versions>
       <manual version="4.1"/>

@@ -4171,9 +4190,10 @@
   <mysqloption id="delayed_insert_limit">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4194,8 +4214,8 @@
   <mysqloption id="delayed_insert_timeout">
     <xrefto id="optvar_delayed_insert_timeout"/>
     <name>delayed_insert_timeout</name>
-    <shortdescription lang="en">How long a INSERT DELAYED thread should wait for
-      INSERT statements before terminating</shortdescription>
+    <shortdescription lang="en">How long a INSERT DELAYED thread should
+      wait for INSERT statements before terminating</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4216,8 +4236,8 @@
   <mysqloption id="delayed_queue_size">
     <xrefto id="optvar_delayed_queue_size"/>
     <name>delayed_queue_size</name>
-    <shortdescription lang="en">What size queue (in rows) should be allocated
-      for handling INSERT DELAYED. </shortdescription>
+    <shortdescription lang="en">What size queue (in rows) should be
+      allocated for handling INSERT DELAYED. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4238,14 +4258,15 @@
   <mysqloption id="des-key-file">
     <xrefto id="optvar_des-key-file"/>
     <name>des-key-file</name>
-    <shortdescription lang="en">Load keys for des_encrypt() and des_encrypt from
-      given file</shortdescription>
+    <shortdescription lang="en">Load keys for des_encrypt() and
+      des_encrypt from given file</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--des-key-file=name" setvar="des-key-file"/>
+      <optype class="cmdline" format="--des-key-file=name"
+        setvar="des-key-file"/>
       <optype class="mycnf"/>
       <vartype class="server" isdynamic="no"/>
     </types>

@@ -4256,10 +4277,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="disconnect-slave-event-count">
-    
+
     <name>disconnect-slave-event-count</name>
-    <shortdescription lang="en">Option used by mysql-test for debugging and
-      testing of replication</shortdescription>
+    <shortdescription lang="en">Option used by mysql-test for debugging
+      and testing of replication</shortdescription>
     <section id="replication"/>
     <opclass class="replication"/>
     <engines includes="all"/>

@@ -4278,8 +4299,8 @@
   <mysqloption id="div_precision_increment">
     <xrefto id="optvar_div_precision_increment"/>
     <name>div_precision_increment</name>
-    <shortdescription lang="en">Precision of the result of '/' operator will be
-      increased on that value</shortdescription>
+    <shortdescription lang="en">Precision of the result of '/' operator
+      will be increased on that value</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4299,8 +4320,8 @@
   <mysqloption id="enable-locking">
     <xrefto id="optvar_external-locking"/>
     <name>enable-locking</name>
-    <shortdescription lang="en">Deprecated option, use --external-locking
-      instead</shortdescription>
+    <shortdescription lang="en">Deprecated option, use
+      --external-locking instead</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4308,8 +4329,8 @@
     <seealso xref="external-locking"/>
     <deprecated version="4.0.3" xref="external-locking"/>
     <types>
-      <optype class="cmdline" format="--enable-locking" setvar="enable-locking"
-      />
+      <optype class="cmdline" format="--enable-locking"
+        setvar="enable-locking"/>
     </types>
     <versions>
       <manual version="4.1"/>

@@ -4318,7 +4339,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="enable-pstack">
-    
+
     <name>enable-pstack</name>
     <shortdescription lang="en">Print a symbolic stack trace on failure</shortdescription>
     <section id="mysqld"/>

@@ -4326,7 +4347,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--enable-pstack" setvar="enable-pstack"/>
+      <optype class="cmdline" format="--enable-pstack"
+        setvar="enable-pstack"/>
       <optype class="mycnf"/>
     </types>
     <versions>

@@ -4336,10 +4358,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="engine-condition-pushdown">
-    
+
     <name>engine-condition-pushdown</name>
-    <shortdescription lang="en">Push supported query conditions to the storage
-      engine</shortdescription>
+    <shortdescription lang="en">Push supported query conditions to the
+      storage engine</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4348,8 +4370,8 @@
       <optype class="cmdline" format="--engine-condition-pushdown"
         setvar="engine_condition_pushdown"/>
       <optype class="mycnf"/>
-      <vartype class="server" scope="both" format="engine_condition_pushdown"
-        isdynamic="yes"/>
+      <vartype class="server" scope="both"
+        format="engine_condition_pushdown" isdynamic="yes"/>
     </types>
     <values vartype="boolean" platform="all"/>
     <versions>

@@ -4358,7 +4380,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="error_count">
-    
+
     <name>error_count</name>
     <shortdescription lang="en">Number of errors</shortdescription>
     <section id="mysqld"/>

@@ -4378,11 +4400,9 @@
   <mysqloption id="event-scheduler">
     <xrefto id="optvar_event-scheduler"/>
     <name>event-scheduler</name>
-    <shortdescription lang="en">
-      Enable/disable and start/stop the event scheduler. Note that this
-      variable underwent singificant changes in behaviour and permitted
-      values in MySQL 5.1.11 and 5.1.12.
-    </shortdescription> 
+    <shortdescription lang="en"> Enable/disable and start/stop the event
+      scheduler. Note that this variable underwent singificant changes
+      in behaviour and permitted values in MySQL 5.1.11 and 5.1.12. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4402,7 +4422,8 @@
   <mysqloption id="exit-info">
     <xrefto id="optvar_exit-info"/>
     <name>exit-info</name>
-    <shortdescription lang="en">Used for debugging; Use at your own risk!</shortdescription>
+    <shortdescription lang="en">Used for debugging; Use at your own
+      risk!</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4421,9 +4442,9 @@
   <mysqloption id="expire_logs_days">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4464,7 +4485,8 @@
   <mysqloption id="flush">
     <xrefto id="optvar_flush"/>
     <name>flush</name>
-    <shortdescription lang="en">Flush tables to disk between SQL commands</shortdescription>
+    <shortdescription lang="en">Flush tables to disk between SQL
+      commands</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4484,14 +4506,15 @@
   <mysqloption id="flush_time">
     <xrefto id="optvar_flush_time"/>
     <name>flush_time</name>
-    <shortdescription lang="en">A dedicated thread is created to flush all
-      tables at the given interval. </shortdescription>
+    <shortdescription lang="en">A dedicated thread is created to flush
+      all tables at the given interval. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--flush_time=#" setvar="flush_time"/>
+      <optype class="cmdline" format="--flush_time=#"
+        setvar="flush_time"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server" scope="global"/>
     </types>

@@ -4503,7 +4526,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="foreign_key_checks">
-    
+
     <name>foreign_key_checks</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -4523,8 +4546,8 @@
   <mysqloption id="ft_boolean_syntax">
     <xrefto id="optvar_ft_boolean_syntax"/>
     <name>ft_boolean_syntax</name>
-    <shortdescription lang="en">List of operators for MATCH ... AGAINST ( ... IN
-      BOOLEAN MODE)</shortdescription>
+    <shortdescription lang="en">List of operators for MATCH ... AGAINST
+      ( ... IN BOOLEAN MODE)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4544,9 +4567,9 @@
   <mysqloption id="ft_max_word_len">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4566,8 +4589,8 @@
   <mysqloption id="ft_min_word_len">
     <xrefto id="optvar_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. </shortdescription>
+    <shortdescription lang="en">The minimum length of the word to be
+      included in a FULLTEXT index. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4608,8 +4631,8 @@
   <mysqloption id="ft_stopword_file">
     <xrefto id="optvar_ft_stopword_file"/>
     <name>ft_stopword_file</name>
-    <shortdescription lang="en">Use stopwords from this file instead of built-in
-      list</shortdescription>
+    <shortdescription lang="en">Use stopwords from this file instead of
+      built-in list</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4627,7 +4650,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="gdb">
-    
+
     <name>gdb</name>
     <shortdescription lang="en">Set up signals usable for debugging</shortdescription>
     <section id="mysqld"/>

@@ -4653,7 +4676,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--general-log" setvar="general-log"/>
+      <optype class="cmdline" format="--general-log"
+        setvar="general-log"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server" scope="global"/>
     </types>

@@ -4681,8 +4705,8 @@
   <mysqloption id="group_concat_max_len">
     <xrefto id="optvar_group_concat_max_len"/>
     <name>group_concat_max_len</name>
-    <shortdescription lang="en">The maximum length of the result of function
-      group_concat</shortdescription>
+    <shortdescription lang="en">The maximum length of the result of
+      function group_concat</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4722,7 +4746,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="identity">
-    
+
     <name>identity</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -4740,16 +4764,17 @@
     </versions>
   </mysqloption>
   <mysqloption id="init-connect">
-    
+
     <name>init-connect</name>
-    <shortdescription lang="en">Command(s) that are executed for each new
-      connection</shortdescription>
+    <shortdescription lang="en">Command(s) that are executed for each
+      new connection</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--init-connect=name" setvar="init_connect"/>
+      <optype class="cmdline" format="--init-connect=name"
+        setvar="init_connect"/>
       <optype class="mycnf"/>
       <vartype class="server" isdynamic="no" format="init_connect"/>
     </types>

@@ -4762,14 +4787,15 @@
   <mysqloption id="init-file">
     <xrefto id="optvar_init-file"/>
     <name>init-file</name>
-    <shortdescription lang="en">Read SQL commands from this file at startup.
-      --init-rpl-role=name Set the replication role</shortdescription>
+    <shortdescription lang="en">Read SQL commands from this file at
+      startup. --init-rpl-role=name Set the replication role</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--init-file=name" setvar="init_file"/>
+      <optype class="cmdline" format="--init-file=name"
+        setvar="init_file"/>
       <optype class="mycnf"/>
       <vartype class="server" format="init_file" isdynamic="no"/>
     </types>

@@ -4780,7 +4806,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="init-rpl-role">
-    
+
     <name>init-rpl-role</name>
     <shortdescription lang="en">Set the replication role</shortdescription>
     <section id="mysqld"/>

@@ -4798,16 +4824,17 @@
     </versions>
   </mysqloption>
   <mysqloption id="init-slave">
-    
+
     <name>init-slave</name>
-    <shortdescription lang="en">Command(s) that are executed when a slave
-      connects to this master</shortdescription>
+    <shortdescription lang="en">Command(s) that are executed when a
+      slave connects to this master</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--init-slave=name" setvar="init_slave"/>
+      <optype class="cmdline" format="--init-slave=name"
+        setvar="init_slave"/>
       <optype class="mycnf"/>
       <vartype class="server" format="init_slave" isdynamic="no"/>
     </types>

@@ -4820,8 +4847,8 @@
   <mysqloption id="innodb">
     <xrefto id="optvar_innodb"/>
     <name>innodb</name>
-    <shortdescription lang="en">Enable InnoDB (if this version of MySQL supports
-      it). </shortdescription>
+    <shortdescription lang="en">Enable InnoDB (if this version of MySQL
+      supports it). </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4840,14 +4867,16 @@
   <mysqloption id="innodb_additional_mem_pool_size">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Size of a memory pool InnoDB uses to
+      store data dictionary information and other internal data
+      structures</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--innodb_additional_mem_pool_size=#"
+      <optype class="cmdline"
+        format="--innodb_additional_mem_pool_size=#"
         setvar="innodb_additional_mem_pool_size"/>
       <optype class="mycnf"/>
       <vartype class="server" isdynamic="no"/>

@@ -4861,7 +4890,8 @@
   <mysqloption id="innodb_autoextend_increment">
     <xrefto id="optvar_innodb_autoextend_increment"/>
     <name>innodb_autoextend_increment</name>
-    <shortdescription lang="en">Data file autoextend increment in megabytes</shortdescription>
+    <shortdescription lang="en">Data file autoextend increment in
+      megabytes</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4882,8 +4912,8 @@
   <mysqloption id="innodb_buffer_pool_awe_mem_mb">
     <xrefto id="optvar_innodb_buffer_pool_awe_mem_mb"/>
     <name>innodb_buffer_pool_awe_mem_mb</name>
-    <shortdescription lang="en">If Windows AWE is used, the size of InnoDB
-      buffer pool allocated from the AWE memory</shortdescription>
+    <shortdescription lang="en">If Windows AWE is used, the size of
+      InnoDB buffer pool allocated from the AWE memory</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4903,8 +4933,8 @@
   <mysqloption id="innodb_buffer_pool_size">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">The size of the memory buffer InnoDB
+      uses to cache data and indexes of its tables</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -4965,8 +4995,9 @@
   <mysqloption id="innodb_concurrency_tickets">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5048,9 +5079,9 @@
   <mysqloption id="innodb_fast_shutdown">
     <xrefto id="optvar_innodb_fast_shutdown"/>
     <name>innodb_fast_shutdown</name>
-    <shortdescription lang="en">Speeds up the shutdown process of the InnoDB
-      storage engine. Possible values are 0, 1 (faster) or 2 (fastest -
-      crash-like)</shortdescription>
+    <shortdescription lang="en">Speeds up the shutdown process of the
+      InnoDB storage engine. Possible values are 0, 1 (faster) or 2
+      (fastest - crash-like)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5098,8 +5129,8 @@
   <mysqloption id="innodb_file_per_table">
     <xrefto id="optvar_innodb_file_per_table"/>
     <name>innodb_file_per_table</name>
-    <shortdescription lang="en">Stores each InnoDB table to an .ibd file in the
-      database dir</shortdescription>
+    <shortdescription lang="en">Stores each InnoDB table to an .ibd file
+      in the database dir</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5122,15 +5153,16 @@
   <mysqloption id="innodb_flush_log_at_trx_commit">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--innodb_flush_log_at_trx_commit[=#]"
+      <optype class="cmdline"
+        format="--innodb_flush_log_at_trx_commit[=#]"
         setvar="innodb_flush_log_at_trx_commit"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>

@@ -5169,8 +5201,8 @@
   <mysqloption id="innodb_force_recovery">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Helps to save your data in case the disk
+      image of the database becomes corrupt</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5193,8 +5225,8 @@
   <mysqloption id="innodb_lock_wait_timeout">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Timeout in seconds an InnoDB transaction
+      may wait for a lock before being rolled back</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5217,8 +5249,8 @@
   <mysqloption id="innodb_locks_unsafe_for_binlog">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Force InnoDB not to use next-key
+      locking. Instead use only row-level locking</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5261,7 +5293,8 @@
   <mysqloption id="innodb_log_archive">
     <xrefto id="optvar_innodb_log_archive"/>
     <name>innodb_log_archive</name>
-    <shortdescription lang="en">Set to 1 if you want to have logs archived</shortdescription>
+    <shortdescription lang="en">Set to 1 if you want to have logs
+      archived</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5279,8 +5312,8 @@
   <mysqloption id="innodb_log_buffer_size">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">The size of the buffer which InnoDB uses
+      to write log to the log files on disk</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5326,8 +5359,9 @@
   <mysqloption id="innodb_log_files_in_group">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5370,7 +5404,8 @@
   <mysqloption id="innodb_max_dirty_pages_pct">
     <xrefto id="optvar_innodb_max_dirty_pages_pct"/>
     <name>innodb_max_dirty_pages_pct</name>
-    <shortdescription lang="en">Percentage of dirty pages allowed in bufferpool</shortdescription>
+    <shortdescription lang="en">Percentage of dirty pages allowed in
+      bufferpool</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5393,8 +5428,8 @@
   <mysqloption id="innodb_max_purge_lag">
     <xrefto id="optvar_innodb_max_purge_lag"/>
     <name>innodb_max_purge_lag</name>
-    <shortdescription lang="en">Desired maximum length of the purge queue (0 =
-      no limit)</shortdescription>
+    <shortdescription lang="en">Desired maximum length of the purge
+      queue (0 = no limit)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5417,8 +5452,8 @@
   <mysqloption id="innodb_mirrored_log_groups">
     <xrefto id="optvar_innodb_mirrored_log_groups"/>
     <name>innodb_mirrored_log_groups</name>
-    <shortdescription lang="en">Number of identical copies of log groups we keep
-      for the database. Currently this should be set to 1</shortdescription>
+    <shortdescription lang="en">Number of identical copies of log groups
+      we keep for the database. Currently this should be set to 1</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5441,8 +5476,8 @@
   <mysqloption id="innodb_open_files">
     <xrefto id="optvar_innodb_open_files"/>
     <name>innodb_open_files</name>
-    <shortdescription lang="en">How many files at the maximum InnoDB keeps open
-      at the same time</shortdescription>
+    <shortdescription lang="en">How many files at the maximum InnoDB
+      keeps open at the same time</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5465,8 +5500,9 @@
   <mysqloption id="innodb_safe_binlog">
     <xrefto id="optvar_innodb_safe_binlog"/>
     <name>innodb_safe_binlog</name>
-    <shortdescription lang="en">After a crash recovery by InnoDB, truncate the
-      binary log after the last not-rolled-back statement/transaction</shortdescription>
+    <shortdescription lang="en">After a crash recovery by InnoDB,
+      truncate the binary log after the last not-rolled-back
+      statement/transaction</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5511,8 +5547,9 @@
   <mysqloption id="innodb_support_xa">
     <xrefto id="optvar_innodb_support_xa"/>
     <name>innodb_support_xa</name>
-    <shortdescription lang="en">Enable InnoDB support for the XA two-phase
-      commit --innodb_table_locks Enable InnoDB locking in LOCK TABLES</shortdescription>
+    <shortdescription lang="en">Enable InnoDB support for the XA
+      two-phase commit --innodb_table_locks Enable InnoDB locking in
+      LOCK TABLES</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5534,7 +5571,8 @@
   <mysqloption id="innodb_sync_spin_loops">
     <xrefto id="optvar_innodb_sync_spin_loops"/>
     <name>innodb_sync_spin_loops</name>
-    <shortdescription lang="en">Count of spin-loop rounds in InnoDB mutexes</shortdescription>
+    <shortdescription lang="en">Count of spin-loop rounds in InnoDB
+      mutexes</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5580,8 +5618,8 @@
     <xrefto id="optvar_innodb_thread_concurrency"/>
     <name>innodb_thread_concurrency</name>
     <shortdescription lang="en">Helps in performance tuning in heavily
-      concurrent environments. Sets the maximum number of threads allowed inside
-      InnoDB. Value 0 will disable the thread throttling</shortdescription>
+      concurrent environments. Sets the maximum number of threads
+      allowed inside InnoDB. Value 0 will disable the thread throttling</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5604,8 +5642,8 @@
   <mysqloption id="innodb_thread_sleep_delay">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Time of innodb thread sleeping before
+      joining InnoDB queue (usec). Value 0 disable a sleep</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5625,7 +5663,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="insert_id">
-    
+
     <name>insert_id</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -5645,8 +5683,8 @@
   <mysqloption id="interactive_timeout">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">The number of seconds the server waits
+      for activity on an interactive connection before closing it</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5667,10 +5705,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="isam">
-    
+
     <name>isam</name>
-    <shortdescription lang="en">Obsolete. ISAM storage engine is no longer
-      supported</shortdescription>
+    <shortdescription lang="en">Obsolete. ISAM storage engine is no
+      longer supported</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5692,8 +5730,8 @@
   <mysqloption id="join_buffer_size">
     <xrefto id="optvar_join_buffer_size"/>
     <name>join_buffer_size</name>
-    <shortdescription lang="en">The size of the buffer that is used for full
-      joins</shortdescription>
+    <shortdescription lang="en">The size of the buffer that is used for
+      full joins</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5716,8 +5754,8 @@
   <mysqloption id="key_buffer_size">
     <xrefto id="optvar_key_buffer_size"/>
     <name>key_buffer_size</name>
-    <shortdescription lang="en">The size of the buffer used for index blocks for
-      MyISAM tables</shortdescription>
+    <shortdescription lang="en">The size of the buffer used for index
+      blocks for MyISAM tables</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5740,10 +5778,11 @@
   <mysqloption id="key_cache_age_threshold">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5789,8 +5828,8 @@
   <mysqloption id="key_cache_division_limit">
     <xrefto id="optvar_key_cache_division_limit"/>
     <name>key_cache_division_limit</name>
-    <shortdescription lang="en">The minimum percentage of warm blocks in key
-      cache</shortdescription>
+    <shortdescription lang="en">The minimum percentage of warm blocks in
+      key cache</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5813,8 +5852,8 @@
   <mysqloption id="language">
     <xrefto id="optvar_language"/>
     <name>language</name>
-    <shortdescription lang="en">Client error messages in given language. May be
-      given as a full path</shortdescription>
+    <shortdescription lang="en">Client error messages in given language.
+      May be given as a full path</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5844,7 +5883,8 @@
     <platforms applies="all"/>
     <disabledby xref="skip-large-pages"/>
     <types>
-      <optype class="cmdline" format="--large-pages" setvar="large-pages"/>
+      <optype class="cmdline" format="--large-pages"
+        setvar="large-pages"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -5857,7 +5897,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="last_insert_id">
-    
+
     <name>last_insert_id</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -5876,8 +5916,8 @@
   </mysqloption>
   <mysqloption id="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>
+    <shortdescription lang="en">The locale that controls the language
+      used to display day and month names</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5898,14 +5938,15 @@
   <mysqloption id="local-infile">
     <xrefto id="optvar_local-infile"/>
     <name>local-infile</name>
-    <shortdescription lang="en">Enable/disable LOAD DATA LOCAL INFILE (takes
-      values 1|0)</shortdescription>
+    <shortdescription lang="en">Enable/disable LOAD DATA LOCAL INFILE
+      (takes values 1|0)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--local-infile" setvar="local_infile"/>
+      <optype class="cmdline" format="--local-infile"
+        setvar="local_infile"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server" format="local_infile"/>
     </types>

@@ -5962,8 +6003,8 @@
   <mysqloption id="log-bin-index">
     <xrefto id="optvar_log-bin-index"/>
     <name>log-bin-index</name>
-    <shortdescription lang="en">File that holds the names for last binary log
-      files</shortdescription>
+    <shortdescription lang="en">File that holds the names for last
+      binary log files</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -5983,9 +6024,10 @@
   <mysqloption id="log-bin-trust-function-creators">
     <xrefto id="optvar_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 this function may not break binary logging</shortdescription>
+    <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 this function may
+      not break binary logging</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6006,9 +6048,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="log-bin-trust-routine-creators">
-    
+
     <name>log-bin-trust-routine-creators</name>
-    <shortdescription lang="en">(deprecated) Use log-bin-trust-function-creators</shortdescription>
+    <shortdescription lang="en">(deprecated) Use
+      log-bin-trust-function-creators</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6036,7 +6079,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--log-error[=name]" setvar="log-error"/>
+      <optype class="cmdline" format="--log-error[=name]"
+        setvar="log-error"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -6055,7 +6099,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--log-isam[=name]" setvar="log-isam"/>
+      <optype class="cmdline" format="--log-isam[=name]"
+        setvar="log-isam"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -6071,8 +6116,9 @@
   <mysqloption id="log-long-format">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Log some extra information to update
+      log. Please note that this option is deprecated; see
+      --log-short-format option</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6091,14 +6137,15 @@
   <mysqloption id="log-output">
     <xrefto id="optvar_log-output"/>
     <name>log-output</name>
-    <shortdescription lang="en">Syntax: log-output[=value[,value...]], where
-      "value" could be TABLE, FILE, or NONE.</shortdescription>
+    <shortdescription lang="en">Syntax: log-output[=value[,value...]],
+      where "value" could be TABLE, FILE, or NONE.</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--log-output[=name]" setvar="log-output"/>
+      <optype class="cmdline" format="--log-output[=name]"
+        setvar="log-output"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server" scope="global"/>
     </types>

@@ -6116,8 +6163,8 @@
   <mysqloption id="log-queries-not-using-indexes">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Log queries that are executed without
+      benefit of any index to the slow log if it is open</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6133,15 +6180,15 @@
       <value default="FALSE"/>
     </values>
     <versions>
-<introduced version="5.1.11"/>
+      <introduced version="5.1.11"/>
       <manual version="5.1"/>
     </versions>
   </mysqloption>
   <mysqloption id="log-short-format">
     <xrefto id="optvar_log-short-format"/>
     <name>log-short-format</name>
-    <shortdescription lang="en">Don't log extra information to update and
-      slow-query logs</shortdescription>
+    <shortdescription lang="en">Don't log extra information to update
+      and slow-query logs</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6187,8 +6234,8 @@
   <mysqloption id="log-slow-admin-statements">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Log slow OPTIMIZE, ANALYZE, ALTER and
+      other administrative statements to the slow log if it is open</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6211,9 +6258,9 @@
   <mysqloption id="log-slow-queries">
     <xrefto id="slow-query-log"/>
     <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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6222,14 +6269,14 @@
     <types>
       <optype class="cmdline" format="--log-slow-queries[=name]"
         setvar="log_slow_queries" outversion="5.1.6"/>
-      <optype class="cmdline" format="--log-slow-queries" inversion="5.1.6"
-        setvar="log_slow_queries" />
+      <optype class="cmdline" format="--log-slow-queries"
+        inversion="5.1.6" setvar="log_slow_queries"/>
       <optype class="mycnf" outversion="5.1.6"/>
       <vartype format="log_slow_queries" isdynamic="yes" class="server"
         outversion="5.1.6"/>
     </types>
     <versions>
-      
+
       <manual version="4.1"/>
       <manual version="5.0"/>
       <manual version="5.1"/>

@@ -6238,9 +6285,9 @@
   <mysqloption id="log-tc">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Path to transaction coordinator log
+      (used for transactions that affect more than one storage engine,
+      when binary log is disabled)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6267,7 +6314,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--log-tc-size=#" setvar="log-tc-size"/>
+      <optype class="cmdline" format="--log-tc-size=#"
+        setvar="log-tc-size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -6280,17 +6328,19 @@
     </versions>
   </mysqloption>
   <mysqloption id="log-update">
-    
+
     <name>log-update</name>
-    <shortdescription lang="en">The update log is deprecated since version 5.0,
-      is replaced by the binary log and this option justs turns on</shortdescription>
+    <shortdescription lang="en">The update log is deprecated since
+      version 5.0, is replaced by the binary log and this option justs
+      turns on</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <deprecated version="5.0" xref="log-bin"/>
     <types>
-      <optype class="cmdline" format="--log-update[=name]" setvar="log-update"/>
+      <optype class="cmdline" format="--log-update[=name]"
+        setvar="log-update"/>
       <vartype isdynamic="yes" class="server"/>
     </types>
     <versions>

@@ -6302,13 +6352,15 @@
   <mysqloption id="log-warnings">
     <xrefto id="optvar_log-warnings"/>
     <name>log-warnings</name>
-    <shortdescription lang="en">Log some not critical warnings to the log file</shortdescription>
+    <shortdescription lang="en">Log some not critical warnings to the
+      log file</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--log-warnings[=#]" setvar="log_warnings"/>
+      <optype class="cmdline" format="--log-warnings[=#]"
+        setvar="log_warnings"/>
       <optype class="cmdline" format="-W" setvar="log_warnings"/>
       <optype class="mycnf" format="log-warnings" setvar="log_warnings"/>
       <vartype isdynamic="yes" class="server" format="log_warnings"/>

@@ -6325,8 +6377,8 @@
   <mysqloption id="long_query_time">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Log all queries that have taken more
+      than long_query_time seconds to execute to file. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6349,8 +6401,8 @@
   <mysqloption id="low-priority-updates">
     <xrefto id="optvar_low-priority-updates"/>
     <name>low-priority-updates</name>
-    <shortdescription lang="en">INSERT/DELETE/UPDATE has lower priority than
-      selects</shortdescription>
+    <shortdescription lang="en">INSERT/DELETE/UPDATE has lower priority
+      than selects</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6359,7 +6411,8 @@
       <optype class="cmdline" format="--low-priority-updates"
         setvar="low_priority_updates"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" format="low_priority_updates"/>
+      <vartype isdynamic="yes" class="server"
+        format="low_priority_updates"/>
     </types>
     <values vartype="numeric" platform="all">
       <value default="FALSE"/>

@@ -6373,9 +6426,9 @@
   <mysqloption id="lower_case_table_names">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6398,9 +6451,9 @@
   <mysqloption id="master-connect-retry">
     <xrefto id="optvar_master-connect-retry"/>
     <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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6423,13 +6476,15 @@
   <mysqloption id="master-host">
     <xrefto id="optvar_master-host"/>
     <name>master-host</name>
-    <shortdescription lang="en">Master hostname or IP address for replication. </shortdescription>
+    <shortdescription lang="en">Master hostname or IP address for
+      replication. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--master-host=name" setvar="master-host"/>
+      <optype class="cmdline" format="--master-host=name"
+        setvar="master-host"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -6442,8 +6497,9 @@
   <mysqloption id="master-info-file">
     <xrefto id="optvar_master-info-file"/>
     <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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6466,8 +6522,8 @@
   <mysqloption id="master-password">
     <xrefto id="optvar_master-password"/>
     <name>master-password</name>
-    <shortdescription lang="en">The password the slave thread will authenticate
-      with when connecting to the master</shortdescription>
+    <shortdescription lang="en">The password the slave thread will
+      authenticate with when connecting to the master</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6493,7 +6549,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--master-port=#" setvar="master-port"/>
+      <optype class="cmdline" format="--master-port=#"
+        setvar="master-port"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -6509,8 +6566,8 @@
   <mysqloption id="master-retry-count">
     <xrefto id="optvar_master-retry-count"/>
     <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>
+    <shortdescription lang="en">The number of tries the slave will make
+      to connect to the master before giving up</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6533,8 +6590,8 @@
   <mysqloption id="master-ssl">
     <xrefto id="optvar_master-ssl"/>
     <name>master-ssl</name>
-    <shortdescription lang="en">Enable the slave to connect to the master using
-      SSL. </shortdescription>
+    <shortdescription lang="en">Enable the slave to connect to the
+      master using SSL. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6556,8 +6613,8 @@
   <mysqloption id="master-ssl-ca">
     <xrefto id="optvar_master-ssl"/>
     <name>master-ssl-ca</name>
-    <shortdescription lang="en">Master SSL CA file. Only applies if you have
-      enabled master-ssl</shortdescription>
+    <shortdescription lang="en">Master SSL CA file. Only applies if you
+      have enabled master-ssl</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6577,8 +6634,8 @@
   <mysqloption id="master-ssl-capath">
     <xrefto id="optvar_master-ssl"/>
     <name>master-ssl-capath</name>
-    <shortdescription lang="en">Master SSL CA path. Only applies if you have
-      enabled master-ssl</shortdescription>
+    <shortdescription lang="en">Master SSL CA path. Only applies if you
+      have enabled master-ssl</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6598,8 +6655,8 @@
   <mysqloption id="master-ssl-cert">
     <xrefto id="optvar_master-ssl"/>
     <name>master-ssl-cert</name>
-    <shortdescription lang="en">Master SSL certificate file name. Only applies
-      if you have enabled master-ssl</shortdescription>
+    <shortdescription lang="en">Master SSL certificate file name. Only
+      applies if you have enabled master-ssl</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6619,8 +6676,8 @@
   <mysqloption id="master-ssl-cipher">
     <xrefto id="optvar_master-ssl"/>
     <name>master-ssl-cipher</name>
-    <shortdescription lang="en">Master SSL cipher. Only applies if you have
-      enabled master-ssl</shortdescription>
+    <shortdescription lang="en">Master SSL cipher. Only applies if you
+      have enabled master-ssl</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6640,8 +6697,8 @@
   <mysqloption id="master-ssl-key">
     <xrefto id="optvar_master-ssl"/>
     <name>master-ssl-key</name>
-    <shortdescription lang="en">Master SSL keyfile name. Only applies if you
-      have enabled master-ssl</shortdescription>
+    <shortdescription lang="en">Master SSL keyfile name. Only applies if
+      you have enabled master-ssl</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6661,18 +6718,19 @@
   <mysqloption id="master-user">
     <xrefto id="optvar_master-user"/>
     <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.
-      --max-binlog-dump-events=# Option used by mysql-test for debugging and
-      testing of replication</shortdescription>
+    <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. --max-binlog-dump-events=# Option used by mysql-test for
+      debugging and testing of replication</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--master-user=name" setvar="master-user"/>
+      <optype class="cmdline" format="--master-user=name"
+        setvar="master-user"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -6686,10 +6744,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="max-binlog-dump-events">
-    
+
     <name>max-binlog-dump-events</name>
-    <shortdescription lang="en">Option used by mysql-test for debugging and
-      testing of replication</shortdescription>
+    <shortdescription lang="en">Option used by mysql-test for debugging
+      and testing of replication</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6712,7 +6770,8 @@
   <mysqloption id="max_allowed_packet">
     <xrefto id="optvar_max_allowed_packet"/>
     <name>max_allowed_packet</name>
-    <shortdescription lang="en">Max packetlength to send/receive from to server</shortdescription>
+    <shortdescription lang="en">Max packetlength to send/receive from to
+      server</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6735,8 +6794,8 @@
   <mysqloption id="max_binlog_cache_size">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Can be used to restrict the total size
+      used to cache a multi-transaction query</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6759,8 +6818,8 @@
   <mysqloption id="max_binlog_size">
     <xrefto id="optvar_max_binlog_size"/>
     <name>max_binlog_size</name>
-    <shortdescription lang="en">Binary log will be rotated automatically when
-      the size exceeds this value</shortdescription>
+    <shortdescription lang="en">Binary log will be rotated automatically
+      when the size exceeds this value</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6783,8 +6842,9 @@
   <mysqloption id="max_connect_errors">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6807,7 +6867,8 @@
   <mysqloption id="max_connections">
     <xrefto id="optvar_max_connections"/>
     <name>max_connections</name>
-    <shortdescription lang="en">The number of simultaneous clients allowed</shortdescription>
+    <shortdescription lang="en">The number of simultaneous clients
+      allowed</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6833,9 +6894,9 @@
   <mysqloption id="max_delayed_threads">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6858,9 +6919,9 @@
   <mysqloption id="max_error_count">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6883,8 +6944,8 @@
   <mysqloption id="max_heap_table_size">
     <xrefto id="optvar_max_heap_table_size"/>
     <name>max_heap_table_size</name>
-    <shortdescription lang="en">Don't allow creation of heap tables bigger than
-      this</shortdescription>
+    <shortdescription lang="en">Don't allow creation of heap tables
+      bigger than this</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -6905,7 +6966,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="max_insert_delayed_threads">
-    
+
     <name>max_insert_delayed_threads</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -6925,14 +6986,15 @@
   <mysqloption id="max_join_size">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Joins that are probably going to read
+      more than max_join_size records return an error</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--max_join_size=#" setvar="max_join_size"/>
+      <optype class="cmdline" format="--max_join_size=#"
+        setvar="max_join_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server" scope="both"/>
     </types>

@@ -6971,8 +7033,8 @@
   <mysqloption id="max_prepared_stmt_count">
     <xrefto id="optvar_max_prepared_stmt_count"/>
     <name>max_prepared_stmt_count</name>
-    <shortdescription lang="en">Maximum number of prepared statements in the
-      server</shortdescription>
+    <shortdescription lang="en">Maximum number of prepared statements in
+      the server</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7019,8 +7081,8 @@
   <mysqloption id="max_seeks_for_key">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Limit assumed max number of seeks when
+      looking up rows based on a key</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7043,8 +7105,8 @@
   <mysqloption id="max_sort_length">
     <xrefto id="optvar_max_sort_length"/>
     <name>max_sort_length</name>
-    <shortdescription lang="en">The number of bytes to use when sorting BLOB or
-      TEXT values </shortdescription>
+    <shortdescription lang="en">The number of bytes to use when sorting
+      BLOB or TEXT values </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7067,8 +7129,8 @@
   <mysqloption id="max_sp_recursion_depth">
     <xrefto id="optvar_max_sp_recursion_depth"/>
     <name>max_sp_recursion_depth</name>
-    <shortdescription lang="en">Maximum stored procedure recursion depth.
-      (discussed with docs)</shortdescription>
+    <shortdescription lang="en">Maximum stored procedure recursion
+      depth. (discussed with docs)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7090,8 +7152,8 @@
   <mysqloption id="max_tmp_tables">
     <xrefto id="optvar_max_tmp_tables"/>
     <name>max_tmp_tables</name>
-    <shortdescription lang="en">Maximum number of temporary tables a client can
-      keep open at a time. </shortdescription>
+    <shortdescription lang="en">Maximum number of temporary tables a
+      client can keep open at a time. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7114,8 +7176,8 @@
   <mysqloption id="max_user_connections">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">The maximum number of active connections
+      for a single user (0 = no limit)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7138,8 +7200,8 @@
   <mysqloption id="max_write_lock_count">
     <xrefto id="optvar_max_write_lock_count"/>
     <name>max_write_lock_count</name>
-    <shortdescription lang="en">After this many write locks, allow some read
-      locks to run in between</shortdescription>
+    <shortdescription lang="en">After this many write locks, allow some
+      read locks to run in between</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7168,9 +7230,11 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--memlock" setvar="locked_in_memory"/>
+      <optype class="cmdline" format="--memlock"
+        setvar="locked_in_memory"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" format="locked_in_memory"/>
+      <vartype isdynamic="yes" class="server" format="locked_in_memory"
+      />
     </types>
     <values vartype="boolean" platform="all">
       <value default="FALSE"/>

@@ -7186,12 +7250,18 @@
     <name>license</name>
     <shortdescription lang="">Type of license for the server</shortdescription>
     <opclass class="server"/>
-    <types><vartype class="server" isdynamic="no"/></types>
-    <versions><manual version="4.1"/><manual version="5.0"/><manual version="5.1"/></versions>
+    <types>
+      <vartype class="server" isdynamic="no"/>
+    </types>
+    <versions>
+      <manual version="4.1"/>
+      <manual version="5.0"/>
+      <manual version="5.1"/>
+    </versions>
   </mysqloption>
-  
+
   <mysqloption id="merge">
-    
+
     <name>merge</name>
     <shortdescription lang="en">Enable Merge storage engine</shortdescription>
     <section id="mysqld"/>

@@ -7213,7 +7283,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="multi_range_count">
-    
+
     <name>multi_range_count</name>
     <shortdescription lang="en">Number of key ranges to request at once</shortdescription>
     <section id="mysqld"/>

@@ -7255,8 +7325,9 @@
   <mysqloption id="myisam-recover">
     <xrefto id="optvar_myisam-recover"/>
     <name>myisam-recover</name>
-    <shortdescription lang="en">Syntax: myisam-recover[=option[,option...]],
-      where option can be DEFAULT, BACKUP, FORCE or QUICK</shortdescription>
+    <shortdescription lang="en">Syntax:
+      myisam-recover[=option[,option...]], where option can be DEFAULT,
+      BACKUP, FORCE or QUICK</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7281,9 +7352,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="myisam_block_size">
-    
+
     <name>myisam_block_size</name>
-    <shortdescription lang="en">Block size to be used for MyISAM index pages</shortdescription>
+    <shortdescription lang="en">Block size to be used for MyISAM index
+      pages</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7306,8 +7378,8 @@
   <mysqloption id="myisam_data_pointer_size">
     <xrefto id="optvar_myisam_data_pointer_size"/>
     <name>myisam_data_pointer_size</name>
-    <shortdescription lang="en">Default pointer size to be used for MyISAM
-      tables</shortdescription>
+    <shortdescription lang="en">Default pointer size to be used for
+      MyISAM tables</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7337,7 +7409,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--myisam_max_extra_sort_file_size=#"
+      <optype class="cmdline"
+        format="--myisam_max_extra_sort_file_size=#"
         setvar="myisam_max_extra_sort_file_size"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>

@@ -7354,8 +7427,8 @@
   <mysqloption id="myisam_max_sort_file_size">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Don't use the fast sort index method to
+      created index if the temporary file would get bigger than this</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7378,8 +7451,8 @@
   <mysqloption id="myisam_repair_threads">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Number of threads to use when repairing
+      MyISAM tables. The value of 1 disables parallel repair</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7402,9 +7475,9 @@
   <mysqloption id="myisam_sort_buffer_size">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7427,8 +7500,8 @@
   <mysqloption id="myisam_stats_method">
     <xrefto id="optvar_myisam_stats_method"/>
     <name>myisam_stats_method</name>
-    <shortdescription lang="en">Specifies how MyISAM index statistics collection
-      code should threat NULLs.</shortdescription>
+    <shortdescription lang="en">Specifies how MyISAM index statistics
+      collection code should threat NULLs.</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7457,8 +7530,8 @@
   <mysqloption id="myisam_use_mmap">
     <xrefto id="optvar_myisam_use_mmap"/>
     <name>myisam_use_mmap</name>
-    <shortdescription lang="en">Use memory mapping for reading and writing
-      MyISAM tables</shortdescription>
+    <shortdescription lang="en">Use memory mapping for reading and
+      writing MyISAM tables</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7478,7 +7551,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-autoincrement-prefetch-sz">
-    
+
     <name>ndb-autoincrement-prefetch-sz</name>
     <shortdescription lang="en">NDB Auto-increment prefetch size</shortdescription>
     <section id="mysqld"/>

@@ -7494,7 +7567,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-cache-check-time">
-    
+
     <name>ndb-cache-check-time</name>
     <shortdescription lang="en">NDB Cache check time</shortdescription>
     <section id="mysqld"/>

@@ -7526,7 +7599,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-distribution">
-    
+
     <name>ndb-distribution</name>
     <shortdescription lang="en">NDB Distribution</shortdescription>
     <section id="mysqld"/>

@@ -7542,7 +7615,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-index-stat-cache-entries">
-    
+
     <name>ndb-index-stat-cache-entries</name>
     <shortdescription lang="en">NDB Index Stat Cache Entries</shortdescription>
     <section id="mysqld"/>

@@ -7558,7 +7631,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-index-stat-enable">
-    
+
     <name>ndb-index-stat-enable</name>
     <shortdescription lang="en">NDB Index Stat Enable</shortdescription>
     <section id="mysqld"/>

@@ -7574,7 +7647,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-index-stat-update-freq">
-    
+
     <name>ndb-index-stat-update-freq</name>
     <shortdescription lang="en">NDB Index Stat Update Frequency</shortdescription>
     <section id="mysqld"/>

@@ -7590,7 +7663,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-mgmd-host">
-    
+
     <name>ndb-mgmd-host</name>
     <shortdescription lang="en">NDB Management (mgmd) Host</shortdescription>
     <section id="mysqld"/>

@@ -7606,18 +7679,19 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-nodeid">
-    
+
     <name>ndb-nodeid</name>
-    <shortdescription lang="en">Nodeid for this mysqlserver in the cluster.
-      --ndb-autoincrement-prefetch-sz=# Specify number of autoincrement values
-      that are prefetched. --ndb-distribution=name Default distribution for new
-      tables in ndb</shortdescription>
+    <shortdescription lang="en">Nodeid for this mysqlserver in the
+      cluster. --ndb-autoincrement-prefetch-sz=# Specify number of
+      autoincrement values that are prefetched. --ndb-distribution=name
+      Default distribution for new tables in ndb</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--ndb-nodeid=#" setvar="ndb-nodeid"/>
+      <optype class="cmdline" format="--ndb-nodeid=#"
+        setvar="ndb-nodeid"/>
       <vartype isdynamic="yes" class="server"/>
     </types>
     <values vartype="numeric" platform="all">

@@ -7628,7 +7702,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-optimized-node-selection">
-    
+
     <name>ndb-optimized-node-selection</name>
     <shortdescription lang="en">NDB Optimized node selection</shortdescription>
     <section id="mysqld"/>

@@ -7644,7 +7718,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-report-thresh-binlog-epoch-slip3">
-    
+
     <name>ndb-report-thresh-binlog-epoch-slip3</name>
     <shortdescription lang="en">NDB Report Thresh Binary Log Epoch Slip</shortdescription>
     <section id="mysqld"/>

@@ -7660,9 +7734,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-report-thresh-binlog-mem-usage10">
-    
+
     <name>ndb-report-thresh-binlog-mem-usage10</name>
-    <shortdescription lang="en">NDB Report Thresh Binary Log Memory Usage</shortdescription>
+    <shortdescription lang="en">NDB Report Thresh Binary Log Memory
+      Usage</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7676,9 +7751,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="ndb-shm">
-    
+
     <name>ndb-shm</name>
-    <shortdescription lang="en">Use shared memory connections when available</shortdescription>
+    <shortdescription lang="en">Use shared memory connections when
+      available</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7737,7 +7813,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--ndb-force-send" setvar="ndb_force_send"/>
+      <optype class="cmdline" format="--ndb-force-send"
+        setvar="ndb_force_send"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -7791,8 +7868,8 @@
   <mysqloption id="ndbcluster">
     <xrefto id="optvar_ndbcluster"/>
     <name>ndbcluster</name>
-    <shortdescription lang="en">Enable NDB Cluster (if this version of MySQL
-      supports it)</shortdescription>
+    <shortdescription lang="en">Enable NDB Cluster (if this version of
+      MySQL supports it)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7838,8 +7915,8 @@
   <mysqloption id="net_read_timeout">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Number of seconds to wait for more data
+      from a connection before aborting the read</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7886,8 +7963,8 @@
   <mysqloption id="net_write_timeout">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Number of seconds to wait for a block to
+      be written to a connection before aborting the write</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -7946,7 +8023,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="old-alter-table">
-    
+
     <name>old-alter-table</name>
     <shortdescription lang="en">Use old, non-optimized alter table</shortdescription>
     <section id="mysqld"/>

@@ -7969,14 +8046,15 @@
   <mysqloption id="old-passwords">
     <xrefto id="optvar_old-passwords"/>
     <name>old-passwords</name>
-    <shortdescription lang="en">Use old password encryption method (needed for
-      4.0 and older clients)</shortdescription>
+    <shortdescription lang="en">Use old password encryption method
+      (needed for 4.0 and older clients)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--old-passwords" setvar="old_passwords"/>
+      <optype class="cmdline" format="--old-passwords"
+        setvar="old_passwords"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server" format="old_passwords"/>
     </types>

@@ -7990,10 +8068,11 @@
     </versions>
   </mysqloption>
   <mysqloption 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>
+    <shortdescription lang="en">Enable old-style user limits (before
+      5.0.3 user resources were counted per each user+host vs. per
+      account)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8015,8 +8094,8 @@
   <mysqloption id="open_files_limit">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">If this is not 0, then mysqld will use
+      this value to reserve file descriptors to use with setrlimit()</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8039,9 +8118,9 @@
   <mysqloption id="optimizer_prune_level">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Controls the heuristic(s) applied during
+      query optimization to prune less-promising partial plans from the
+      optimizer search space. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8063,8 +8142,8 @@
   <mysqloption id="optimizer_search_depth">
     <xrefto id="optvar_optimizer_search_depth"/>
     <name>optimizer_search_depth</name>
-    <shortdescription lang="en">Maximum depth of search performed by the query
-      optimizer</shortdescription>
+    <shortdescription lang="en">Maximum depth of search performed by the
+      query optimizer</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8114,7 +8193,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--plugin_dir=name" setvar="plugin_dir"/>
+      <optype class="cmdline" format="--plugin_dir=name"
+        setvar="plugin_dir"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -8151,8 +8231,8 @@
   <mysqloption id="port-open-timeout">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Maximum time in seconds to wait for the
+      port to become free. (Default: no wait)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8174,8 +8254,8 @@
   <mysqloption id="preload_buffer_size">
     <xrefto id="optvar_preload_buffer_size"/>
     <name>preload_buffer_size</name>
-    <shortdescription lang="en">The size of the buffer that is allocated when
-      preloading indexes</shortdescription>
+    <shortdescription lang="en">The size of the buffer that is allocated
+      when preloading indexes</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8196,7 +8276,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="print-defaults">
-    
+
     <name>print-defaults</name>
     <shortdescription lang="en">Print defaults</shortdescription>
     <section id="mysqld"/>

@@ -8213,8 +8293,8 @@
   <mysqloption id="query_alloc_block_size">
     <xrefto id="optvar_query_alloc_block_size"/>
     <name>query_alloc_block_size</name>
-    <shortdescription lang="en">Allocation block size for query parsing and
-      execution</shortdescription>
+    <shortdescription lang="en">Allocation block size for query parsing
+      and execution</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8237,7 +8317,8 @@
   <mysqloption id="query_cache_limit">
     <xrefto id="optvar_query_cache_limit"/>
     <name>query_cache_limit</name>
-    <shortdescription lang="en">Don't cache results that are bigger than this</shortdescription>
+    <shortdescription lang="en">Don't cache results that are bigger than
+      this</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8260,8 +8341,9 @@
   <mysqloption id="query_cache_min_res_unit">
     <xrefto id="optvar_query_cache_min_res_unit"/>
     <name>query_cache_min_res_unit</name>
-    <shortdescription lang="en">minimal size of unit in wich space for results
-      is allocated (last unit will be trimed after writing all result data</shortdescription>
+    <shortdescription lang="en">minimal size of unit in wich space for
+      results is allocated (last unit will be trimed after writing all
+      result data</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8284,8 +8366,8 @@
   <mysqloption id="query_cache_size">
     <xrefto id="optvar_query_cache_size"/>
     <name>query_cache_size</name>
-    <shortdescription lang="en">The memory allocated to store results from old
-      queries</shortdescription>
+    <shortdescription lang="en">The memory allocated to store results
+      from old queries</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8334,8 +8416,8 @@
   <mysqloption id="query_cache_wlock_invalidate">
     <xrefto id="optvar_query_cache_wlock_invalidate"/>
     <name>query_cache_wlock_invalidate</name>
-    <shortdescription lang="en">Invalidate queries in query cache on LOCK for
-      write</shortdescription>
+    <shortdescription lang="en">Invalidate queries in query cache on
+      LOCK for write</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8382,8 +8464,8 @@
   <mysqloption id="range_alloc_block_size">
     <xrefto id="optvar_range_alloc_block_size"/>
     <name>range_alloc_block_size</name>
-    <shortdescription lang="en">Allocation block size for storing ranges during
-      optimization</shortdescription>
+    <shortdescription lang="en">Allocation block size for storing ranges
+      during optimization</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8452,9 +8534,9 @@
   <mysqloption id="read_rnd_buffer_size">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8475,7 +8557,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="record_buffer">
-    
+
     <name>record_buffer</name>
     <shortdescription lang="en">Alias for read_buffer_size</shortdescription>
     <section id="mysqld"/>

@@ -8483,7 +8565,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--record_buffer=#" setvar="record_buffer"/>
+      <optype class="cmdline" format="--record_buffer=#"
+        setvar="record_buffer"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -8499,13 +8582,15 @@
   <mysqloption id="relay-log">
     <xrefto id="optvar_relay-log"/>
     <name>relay-log</name>
-    <shortdescription lang="en">The location and name to use for relay logs. </shortdescription>
+    <shortdescription lang="en">The location and name to use for relay
+      logs. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--relay-log=name" setvar="relay-log"/>
+      <optype class="cmdline" format="--relay-log=name"
+        setvar="relay-log"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -8518,8 +8603,8 @@
   <mysqloption id="relay-log-index">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">The location and name to use for the
+      file that keeps a list of the last relay logs</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8539,8 +8624,8 @@
   <mysqloption id="relay-log-info-file">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">The location and name of the file that
+      remembers where the SQL replication thread is in the relay logs</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8584,7 +8669,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="relay_log_space_limit">
-    
+
     <name>relay_log_space_limit</name>
     <shortdescription lang="en">Maximum space to use for all relay logs</shortdescription>
     <section id="mysqld"/>

@@ -8609,8 +8694,8 @@
   <mysqloption id="replicate-do-db">
     <xrefto id="optvar_replicate-do-db"/>
     <name>replicate-do-db</name>
-    <shortdescription lang="en">Tells the slave thread to restrict replication
-      to the specified database. </shortdescription>
+    <shortdescription lang="en">Tells the slave thread to restrict
+      replication to the specified database. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8628,8 +8713,8 @@
   <mysqloption id="replicate-do-table">
     <xrefto id="optvar_replicate-do-table"/>
     <name>replicate-do-table</name>
-    <shortdescription lang="en">Tells the slave thread to restrict replication
-      to the specified table</shortdescription>
+    <shortdescription lang="en">Tells the slave thread to restrict
+      replication to the specified table</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8646,8 +8731,8 @@
   <mysqloption id="replicate-ignore-db">
     <xrefto id="optvar_replicate-ignore-db"/>
     <name>replicate-ignore-db</name>
-    <shortdescription lang="en">Tells the slave thread to not replicate to the
-      specified database</shortdescription>
+    <shortdescription lang="en">Tells the slave thread to not replicate
+      to the specified database</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8665,8 +8750,8 @@
   <mysqloption id="replicate-ignore-table">
     <xrefto id="optvar_replicate-ignore-table"/>
     <name>replicate-ignore-table</name>
-    <shortdescription lang="en">Tells the slave thread to not replicate to the
-      specified table.</shortdescription>
+    <shortdescription lang="en">Tells the slave thread to not replicate
+      to the specified table.</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8684,8 +8769,8 @@
   <mysqloption id="replicate-rewrite-db">
     <xrefto id="optvar_replicate-rewrite-db"/>
     <name>replicate-rewrite-db</name>
-    <shortdescription lang="en">Updates to a database with a different name than
-      the original.</shortdescription>
+    <shortdescription lang="en">Updates to a database with a different
+      name than the original.</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8703,8 +8788,8 @@
   <mysqloption id="replicate-same-server-id">
     <xrefto id="optvar_replicate-same-server-id"/>
     <name>replicate-same-server-id</name>
-    <shortdescription lang="en">In replication, if set to 1, do not skip events
-      having our server id. </shortdescription>
+    <shortdescription lang="en">In replication, if set to 1, do not skip
+      events having our server id. </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8727,8 +8812,9 @@
   <mysqloption id="replicate-wild-do-table">
     <xrefto id="optvar_replicate-wild-do-table"/>
     <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>
+    <shortdescription lang="en">Tells the slave thread to restrict
+      replication to the tables that match the specified wildcard
+      pattern</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8746,14 +8832,15 @@
   <mysqloption id="replicate-wild-ignore-table">
     <xrefto id="optvar_replicate-wild-ignore-table"/>
     <name>replicate-wild-ignore-table</name>
-    <shortdescription lang="en">Tells the slave thread to not replicate to the
-      tables that match the given wildcard pattern</shortdescription>
+    <shortdescription lang="en">Tells the slave thread to not replicate
+      to the tables that match the given wildcard pattern</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--replicate-wild-ignore-table=name"/>
+      <optype class="cmdline"
+        format="--replicate-wild-ignore-table=name"/>
       <optype class="mycnf"/>
     </types>
     <versions>

@@ -8765,14 +8852,15 @@
   <mysqloption id="report-host">
     <xrefto id="optvar_report-host"/>
     <name>report-host</name>
-    <shortdescription lang="en">Hostname or IP of the slave to be reported to to
-      the master during slave registration</shortdescription>
+    <shortdescription lang="en">Hostname or IP of the slave to be
+      reported to to the master during slave registration</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--report-host=name" setvar="report-host"/>
+      <optype class="cmdline" format="--report-host=name"
+        setvar="report-host"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -8783,7 +8871,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="report-password">
-    
+
     <name>report-password</name>
     <shortdescription lang="en">Undocumented</shortdescription>
     <section id="mysqld"/>

@@ -8805,14 +8893,15 @@
   <mysqloption id="report-port">
     <xrefto id="optvar_report-port"/>
     <name>report-port</name>
-    <shortdescription lang="en">Port for connecting to slave reported to the
-      master during slave registration</shortdescription>
+    <shortdescription lang="en">Port for connecting to slave reported to
+      the master during slave registration</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--report-port=#" setvar="report-port"/>
+      <optype class="cmdline" format="--report-port=#"
+        setvar="report-port"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -8826,15 +8915,17 @@
     </versions>
   </mysqloption>
   <mysqloption id="report-user">
-    
+
     <name>report-user</name>
-    <shortdescription lang="en">Undocumented. --rpl-recovery-rank=# Undocumented</shortdescription>
+    <shortdescription lang="en">Undocumented. --rpl-recovery-rank=#
+      Undocumented</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--report-user=name" setvar="report-user"/>
+      <optype class="cmdline" format="--report-user=name"
+        setvar="report-user"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -8856,7 +8947,8 @@
       <optype class="cmdline" format="--rpl-recovery-rank=#"
         setvar="rpl_recovery_rank"/>
       <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="server" format="rpl_recovery_rank"/>
+      <vartype isdynamic="yes" class="server" format="rpl_recovery_rank"
+      />
     </types>
     <values vartype="numeric" platform="all">
       <value default="0"/>

@@ -8890,8 +8982,8 @@
   <mysqloption id="safe-show-database">
     <xrefto id="optvar_safe-show-database"/>
     <name>safe-show-database</name>
-    <shortdescription lang="en">Deprecated option; use GRANT SHOW DATABASES
-      instead..</shortdescription>
+    <shortdescription lang="en">Deprecated option; use GRANT SHOW
+      DATABASES instead..</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8913,8 +9005,8 @@
   <mysqloption id="safe-user-create">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Don't allow new user creation by the
+      user who has no write privileges to the mysql.user table</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8935,7 +9027,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="safemalloc-mem-limit">
-    
+
     <name>safemalloc-mem-limit</name>
     <shortdescription lang="en">Simulate memory shortage </shortdescription>
     <section id="mysqld"/>

@@ -8955,14 +9047,15 @@
   <mysqloption id="secure-auth">
     <xrefto id="optvar_secure-auth"/>
     <name>secure-auth</name>
-    <shortdescription lang="en">Disallow authentication for accounts that have
-      old (pre-4.1) passwords</shortdescription>
+    <shortdescription lang="en">Disallow authentication for accounts
+      that have old (pre-4.1) passwords</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--secure-auth" setvar="secure_auth"/>
+      <optype class="cmdline" format="--secure-auth"
+        setvar="secure_auth"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server" format="secure_auth"/>
     </types>

@@ -8978,8 +9071,8 @@
   <mysqloption id="server-id">
     <xrefto id="optvar_server-id"/>
     <name>server-id</name>
-    <shortdescription lang="en">Uniquely identifies the server instance in the
-      community of replication partners</shortdescription>
+    <shortdescription lang="en">Uniquely identifies the server instance
+      in the community of replication partners</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -8999,10 +9092,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="set-variable">
-    
+
     <name>set-variable</name>
-    <shortdescription lang="en">Change the value of a variable. Please note that
-      this option is deprecated;</shortdescription>
+    <shortdescription lang="en">Change the value of a variable. Please
+      note that this option is deprecated;</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9020,10 +9113,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="show-slave-auth-info">
-    
+
     <name>show-slave-auth-info</name>
-    <shortdescription lang="en">Show user and password in SHOW SLAVE HOSTS on
-      this master</shortdescription>
+    <shortdescription lang="en">Show user and password in SHOW SLAVE
+      HOSTS on this master</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9044,9 +9137,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="skip-automatic-sp-privileges">
-    
+
     <name>skip-automatic-sp-privileges</name>
-    <shortdescription lang="en">Skip Automatic Stored Procedure Privileges</shortdescription>
+    <shortdescription lang="en">Skip Automatic Stored Procedure
+      Privileges</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9064,8 +9158,8 @@
   <mysqloption id="skip-bdb">
     <xrefto id="optvar_skip-bdb"/>
     <name>skip-bdb</name>
-    <shortdescription lang="en">Disable Berkeley DB (if this version of MySQL
-      supports it).</shortdescription>
+    <shortdescription lang="en">Disable Berkeley DB (if this version of
+      MySQL supports it).</shortdescription>
     <section id="mysqld"/>
     <opclass class="bdb"/>
     <engines>

@@ -9089,14 +9183,15 @@
     </versions>
   </mysqloption>
   <mysqloption id="skip-character-set-client-handshake">
-    
+
     <name>Skip Character set Client Handshake</name>
-    <shortdescription lang="">Ignore client side character set value sent during
-      handshake</shortdescription>
+    <shortdescription lang="">Ignore client side character set value
+      sent during handshake</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <types>
-      <optype class="cmdline" format="--skip-character-set-client-handshake"/>
+      <optype class="cmdline"
+        format="--skip-character-set-client-handshake"/>
       <optype class="mycnf"/>
     </types>
     <versions>

@@ -9128,8 +9223,8 @@
   <mysqloption id="skip-grant-tables">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Start without grant tables. This gives
+      all users FULL ACCESS to all tables!</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9228,7 +9323,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="skip-large-pages">
-    
+
     <name>skiplarge-pages</name>
     <shortdescription lang="en">Disable support for large pages. </shortdescription>
     <section id="mysqld"/>

@@ -9237,7 +9332,8 @@
     <platforms applies="all"/>
     <seealso xref="large-pages"/>
     <types>
-      <optype class="cmdline" format="--skip-large-pages" setvar="large-pages"/>
+      <optype class="cmdline" format="--skip-large-pages"
+        setvar="large-pages"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -9293,8 +9389,8 @@
   <mysqloption id="skip-name-resolve">
     <xrefto id="optvar_skip-name-resolve"/>
     <name>skip-name-resolve</name>
-    <shortdescription lang="en">Don't resolve hostnames. All hostnames are IP's
-      or 'localhost'</shortdescription>
+    <shortdescription lang="en">Don't resolve hostnames. All hostnames
+      are IP's or 'localhost'</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9328,7 +9424,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="skip-new">
-    
+
     <name>skip-new</name>
     <shortdescription lang="en">Don't use new, possible wrong routines. </shortdescription>
     <section id="mysqld"/>

@@ -9405,7 +9501,7 @@
     </versions>
   </mysqloption>
 
-  
+
   <mysqloption id="skip-symbolic-links">
     <xrefto id="optvar_symbolic-links"/>
     <name>skip-symbolic-links</name>

@@ -9425,10 +9521,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="skip-symlink">
-    
+
     <name>skip-symlink</name>
-    <shortdescription lang="en">Don't allow symlinking of tables. Deprecated
-      option. Use</shortdescription>
+    <shortdescription lang="en">Don't allow symlinking of tables.
+      Deprecated option. Use</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9455,7 +9551,8 @@
     <platforms applies="all"/>
     <seealso xref="bdb-no-sync"/>
     <types>
-      <optype class="cmdline" format="--skip-sync-bdb-logs" outversion="5.1.12"/>
+      <optype class="cmdline" format="--skip-sync-bdb-logs"
+        outversion="5.1.12"/>
       <optype class="mycnf"/>
     </types>
     <versions>

@@ -9484,8 +9581,8 @@
   <mysqloption id="slave-load-tmpdir">
     <xrefto id="optvar_slave-load-tmpdir"/>
     <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>
+    <shortdescription lang="en">The location where the slave should put
+      its temporary files when replicating a LOAD DATA INFILE command</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9506,10 +9603,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="slave-skip-errors">
-    
+
     <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>
+    <shortdescription lang="en">Tells the slave thread to continue
+      replication when a query returns an error from the provided list</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9550,8 +9647,8 @@
   <mysqloption id="slave_net_timeout">
     <xrefto id="optvar_slave_net_timeout"/>
     <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>
+    <shortdescription lang="en">Number of seconds to wait for more data
+      from a master/slave connection before aborting the read</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9574,9 +9671,9 @@
   <mysqloption id="slave_transaction_retries">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9605,7 +9702,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--slow-query-log" setvar="slow-query-log"/>
+      <optype class="cmdline" format="--slow-query-log"
+        setvar="slow-query-log"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server" scope="global"/>
     </types>

@@ -9636,8 +9734,9 @@
   <mysqloption id="slow_launch_time">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">If creating the thread takes longer than
+      this value (in seconds), the Slow_launch_threads counter will be
+      incremented</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9691,8 +9790,8 @@
   <mysqloption id="sort_buffer_size">
     <xrefto id="optvar_sort_buffer_size"/>
     <name>sort_buffer_size</name>
-    <shortdescription lang="en">Each thread that needs to do a sort allocates a
-      buffer of this size</shortdescription>
+    <shortdescription lang="en">Each thread that needs to do a sort
+      allocates a buffer of this size</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9713,10 +9812,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="sporadic-binlog-dump-fail">
-    
+
     <name>sporadic-binlog-dump-fail</name>
-    <shortdescription lang="en">Option used by mysql-test for debugging and
-      testing of replication</shortdescription>
+    <shortdescription lang="en">Option used by mysql-test for debugging
+      and testing of replication</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9737,10 +9836,11 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql-bin-update-same">
-    
+
     <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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9763,8 +9863,8 @@
   <mysqloption id="sql-mode">
     <xrefto id="optvar_sql-mode"/>
     <name>sql-mode</name>
-    <shortdescription lang="en">Syntax: sql-mode=option[,option[,option...]]
-      where option can be one of: </shortdescription>
+    <shortdescription lang="en">Syntax:
+      sql-mode=option[,option[,option...]] where option can be one of: </shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -9791,7 +9891,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_auto_is_null">
-    
+
     <name>sql_auto_is_null</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -9809,7 +9909,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_big_selects">
-    
+
     <name>sql_big_selects</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -9827,7 +9927,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_big_tables">
-    
+
     <name>sql_big_tables</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -9845,7 +9945,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_buffer_result">
-    
+
     <name>sql_buffer_result</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -9863,7 +9963,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_log_bin">
-    
+
     <name>sql_log_bin</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -9881,7 +9981,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_log_off">
-    
+
     <name>sql_log_off</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -9899,7 +9999,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_log_update">
-    
+
     <name>sql_log_update</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -9917,7 +10017,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_low_priority_updates">
-    
+
     <name>sql_low_priority_updates</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -9935,7 +10035,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_max_join_size">
-    
+
     <name>sql_max_join_size</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -9953,7 +10053,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_notes">
-    
+
     <name>sql_notes</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -9971,7 +10071,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_quote_show_create">
-    
+
     <name>sql_quote_show_create</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -9989,7 +10089,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_safe_updates">
-    
+
     <name>sql_safe_updates</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -10007,7 +10107,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_select_limit">
-    
+
     <name>sql_select_limit</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -10043,7 +10143,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="sql_warnings">
-    
+
     <name>sql_warnings</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -10061,10 +10161,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="ssl">
-    
+
     <name>ssl</name>
-    <shortdescription lang="en">Enable SSL for connection (automatically enabled
-      with other flags)</shortdescription>
+    <shortdescription lang="en">Enable SSL for connection (automatically
+      enabled with other flags)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10086,8 +10186,8 @@
   <mysqloption id="ssl-ca">
     <xrefto id="optvar_ssl-ca"/>
     <name>ssl-ca</name>
-    <shortdescription lang="en">CA file in PEM format (check OpenSSL docs,
-      implies --ssl)</shortdescription>
+    <shortdescription lang="en">CA file in PEM format (check OpenSSL
+      docs, implies --ssl)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10106,13 +10206,15 @@
   <mysqloption id="ssl-capath">
     <xrefto id="optvar_ssl-capath"/>
     <name>ssl-capath</name>
-    <shortdescription lang="en">CA directory (check OpenSSL docs, implies --ssl)</shortdescription>
+    <shortdescription lang="en">CA directory (check OpenSSL docs,
+      implies --ssl)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--ssl-capath=name" setvar="ssl-capath"/>
+      <optype class="cmdline" format="--ssl-capath=name"
+        setvar="ssl-capath"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -10150,7 +10252,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--ssl-cipher=name" setvar="ssl-cipher"/>
+      <optype class="cmdline" format="--ssl-cipher=name"
+        setvar="ssl-cipher"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -10206,7 +10309,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--symbolic-links" setvar="symbolic-links"/>
+      <optype class="cmdline" format="--symbolic-links"
+        setvar="symbolic-links"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -10224,14 +10328,15 @@
   <mysqloption id="sync-bdb-logs">
     <xrefto id="optvar_sync-bdb-logs"/>
     <name>sync-bdb-logs</name>
-    <shortdescription lang="en">Synchronously flush Berkeley DB logs. Enabled by
-      default</shortdescription>
+    <shortdescription lang="en">Synchronously flush Berkeley DB logs.
+      Enabled by default</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--sync-bdb-logs" setvar="sync-bdb-logs"/>
+      <optype class="cmdline" format="--sync-bdb-logs"
+        setvar="sync-bdb-logs"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -10244,16 +10349,17 @@
     </versions>
   </mysqloption>
   <mysqloption id="sync-binlog">
-    
+
     <name>sync-binlog</name>
-    <shortdescription lang="en">Synchronously flush binary log to disk after
-      every #th event</shortdescription>
+    <shortdescription lang="en">Synchronously flush binary log to disk
+      after every #th event</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--sync-binlog=#" setvar="sync_binlog"/>
+      <optype class="cmdline" format="--sync-binlog=#"
+        setvar="sync_binlog"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server" format="sync_binlog"/>
     </types>

@@ -10267,9 +10373,10 @@
     </versions>
   </mysqloption>
   <mysqloption id="sync-frm">
-    
+
     <name>sync-frm</name>
-    <shortdescription lang="en">Sync .frm to disk on create. Enabled by default</shortdescription>
+    <shortdescription lang="en">Sync .frm to disk on create. Enabled by
+      default</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10291,15 +10398,15 @@
   <mysqloption id="sysdate-is-now">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Non-default option to alias SYSDATE() to
+      NOW() to make it safe-replicable</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--sysdate-is-now" setvar="sysdate-is-now"
-        inversion="5.1.8"/>
+      <optype class="cmdline" format="--sysdate-is-now"
+        setvar="sysdate-is-now" inversion="5.1.8"/>
       <optype class="mycnf" inversion="5.1.8"/>
       <vartype isdynamic="yes" class="server" inversion="5.1.8"/>
     </types>

@@ -10315,14 +10422,16 @@
   <mysqloption id="table_cache">
     <xrefto id="optvar_table_cache"/>
     <name>table_cache</name>
-    <shortdescription lang="en">Deprecated; use --table_open_cache instead</shortdescription>
+    <shortdescription lang="en">Deprecated; use --table_open_cache
+      instead</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <deprecated version="5.1" xref="table_open_cache"/>
     <types>
-      <optype class="cmdline" format="--table_cache=#" setvar="table_cache"/>
+      <optype class="cmdline" format="--table_cache=#"
+        setvar="table_cache"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -10354,9 +10463,9 @@
   <mysqloption id="table_lock_wait_timeout">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10415,8 +10524,8 @@
   <mysqloption id="tc-heuristic-recover">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">Decision to use in heuristic recover
+      process. Possible values are COMMIT or ROLLBACK</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10434,9 +10543,9 @@
   <mysqloption id="temp-pool">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10458,8 +10567,8 @@
   <mysqloption id="thread_cache_size">
     <xrefto id="optvar_thread_cache_size"/>
     <name>thread_cache_size</name>
-    <shortdescription lang="en">How many threads we should keep in a cache for
-      reuse</shortdescription>
+    <shortdescription lang="en">How many threads we should keep in a
+      cache for reuse</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10482,9 +10591,9 @@
   <mysqloption id="thread_concurrency">
     <xrefto id="optvar_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>
+    <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>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10513,7 +10622,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--thread_stack=#" setvar="thread_stack"/>
+      <optype class="cmdline" format="--thread_stack=#"
+        setvar="thread_stack"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -10535,7 +10645,8 @@
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--time_format=name" setvar="time_format"/>
+      <optype class="cmdline" format="--time_format=name"
+        setvar="time_format"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -10564,16 +10675,17 @@
     </versions>
   </mysqloption>
   <mysqloption id="timed_mutexes">
-    
+
     <name>timed_mutexes</name>
-    <shortdescription lang="en">Specify whether to time mutexes (only InnoDB
-      mutexes are currently supported)</shortdescription>
+    <shortdescription lang="en">Specify whether to time mutexes (only
+      InnoDB mutexes are currently supported)</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--timed_mutexes" setvar="timed_mutexes"/>
+      <optype class="cmdline" format="--timed_mutexes"
+        setvar="timed_mutexes"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server"/>
     </types>

@@ -10587,7 +10699,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="timestamp">
-    
+
     <name>timestamp</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -10607,8 +10719,9 @@
   <mysqloption id="tmp_table_size">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">If an in-memory temporary table exceeds
+      this size, MySQL will automatically convert it to an on-disk
+      MyISAM table</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10669,8 +10782,8 @@
   <mysqloption id="transaction_alloc_block_size">
     <xrefto id="optvar_transaction_alloc_block_size"/>
     <name>transaction_alloc_block_size</name>
-    <shortdescription lang="en">Allocation block size for transactions to be
-      stored in binary log</shortdescription>
+    <shortdescription lang="en">Allocation block size for transactions
+      to be stored in binary log</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10693,8 +10806,8 @@
   <mysqloption id="transaction_prealloc_size">
     <xrefto id="optvar_transaction_prealloc_size"/>
     <name>transaction_prealloc_size</name>
-    <shortdescription lang="en">Persistent buffer for transactions to be stored
-      in binary log</shortdescription>
+    <shortdescription lang="en">Persistent buffer for transactions to be
+      stored in binary log</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10733,7 +10846,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="unique_checks">
-    
+
     <name>unique_checks</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -10774,7 +10887,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="use-symbolic-links">
-    
+
     <name>use-symbolic-links</name>
     <shortdescription lang="en">Enable symbolic link support.</shortdescription>
     <section id="mysqld"/>

@@ -10813,7 +10926,8 @@
   </mysqloption>
   <mysqloption id="verbose">
     <name>verbose</name>
-    <shortdescription lang="en">Used with --help option for detailed help</shortdescription>
+    <shortdescription lang="en">Used with --help option for detailed
+      help</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>

@@ -10854,14 +10968,15 @@
   <mysqloption id="wait_timeout">
     <xrefto id="optvar_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>
+    <shortdescription lang="en">The number of seconds the server waits
+      for activity on a connection before closing it</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>
     <platforms applies="all"/>
     <types>
-      <optype class="cmdline" format="--wait_timeout=#" setvar="wait_timeout"/>
+      <optype class="cmdline" format="--wait_timeout=#"
+        setvar="wait_timeout"/>
       <optype class="mycnf"/>
       <vartype isdynamic="yes" class="server" scope="both"/>
     </types>

@@ -10872,7 +10987,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="warning_count">
-    
+
     <name>warning_count</name>
     <shortdescription lang=""/>
     <section id="mysqld"/>

@@ -10890,7 +11005,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="warnings">
-    
+
     <name>warnings</name>
     <shortdescription lang="en">Deprecated; use --log-warnings instead</shortdescription>
     <section id="mysqld"/>

@@ -10910,7 +11025,7 @@
     </versions>
   </mysqloption>
   <mysqloption id="with-debug">
-    
+
     <name>with-debug</name>
     <shortdescription lang="en">option</shortdescription>
     <section id="mysqld"/>

@@ -10930,8 +11045,8 @@
   <mysqloption id="Aborted_clients">
     <xrefto id="optvar_Aborted_clients"/>
     <name>Aborted_clients</name>
-    <shortdescription lang="en">The number of connections aborted because the
-      client died without closing the connection properly</shortdescription>
+    <shortdescription lang="en">The number of connections aborted
+      because the client died without closing the connection properly</shortdescription>
     <section id="mysqld"/>
     <opclass class="server"/>
     <engines includes="all"/>


Modified: branches/telcos/refman-5.1/database-administration.xml
===================================================================
--- branches/telcos/refman-5.1/database-administration.xml	2007-03-12 13:42:08 UTC (rev 5302)
+++ branches/telcos/refman-5.1/database-administration.xml	2007-03-12 13:45:24 UTC (rev 5303)
Changed blocks: 9, Lines Added: 22, Lines Deleted: 17; 5259 bytes

@@ -975,7 +975,8 @@
               <replaceable>debug_options</replaceable> string often is
               <literal>'d:t:o,<replaceable>file_name</replaceable>'</literal>.
               The default is <literal>'d:t:i:o,mysqld.trace'</literal>.
-              See <ulink url="http://dev.mysql.com/doc/internals/en/making-trace-files"/>.
+              See
+              <ulink url="http://dev.mysql.com/doc/internals/en/making-trace-files"/>.
             </para>
 
             <para>

@@ -2052,28 +2053,29 @@
               <xref linkend="mysql-cluster-connectstring"/>, for syntax.
             </para>
           </listitem>
-          
+
           <listitem>
             <para id="optvar_ndb-wait-connected">
               <indexterm>
                 <primary>mysqld</primary>
                 <secondary>ndb-wait-connected option</secondary>
               </indexterm>
-              
+
               <indexterm>
                 <primary>ndb-wait-connected option</primary>
                 <secondary>mysqld</secondary>
               </indexterm>
+
               <option>--ndb-wait-connected=<replaceable>seconds</replaceable></option>
             </para>
-            
+
             <para>
               This option causes the MySQL server to wait a given number
               of seconds for connection to cluster management and data
               nodes before starting to accept MySQL client connections.
               The default value is 0.
             </para>
-            
+
             <para>
               This option was added in MySQL 5.1.16/NDB-6.2.0.
             </para>

@@ -2157,7 +2159,8 @@
             <para>
               Only use one thread (for debugging under Linux). This
               option is available only if the server is built with
-              debugging enabled. See <ulink url="http://dev.mysql.com/doc/internals/en/debugging-server"/>.
+              debugging enabled. See
+              <ulink url="http://dev.mysql.com/doc/internals/en/debugging-server"/>.
             </para>
           </listitem>
 

@@ -2792,7 +2795,8 @@
               Don't write stack traces. This option is useful when you
               are running <command>mysqld</command> under a debugger. On
               some systems, you also must use this option to get a core
-              file. See <ulink url="http://dev.mysql.com/doc/internals/en/debugging-server"/>.
+              file. See
+              <ulink url="http://dev.mysql.com/doc/internals/en/debugging-server"/>.
             </para>
           </listitem>
 

@@ -5392,7 +5396,7 @@
               such as <literal>CREATE TABLE</literal> or altered with
               <literal>ALTER TABLE</literal> or <literal>TRUNCATE
               TABLE</literal>.
-            </para>            
+            </para>
           </listitem>
 
           <listitem>

@@ -5930,12 +5934,12 @@
               This variable was added in MySQL 5.1.12.
             </para>
           </listitem>
-          
+
           <listitem>
             <para id="optvar_ndb_use_exact_count">
               <literal>ndb_use_exact_count</literal>
             </para>
-            
+
             <para>
               Forces <literal>NDB</literal> to use a count of records
               during <literal>SELECT COUNT(*)</literal> query planning

@@ -18143,8 +18147,8 @@
         MySQL 5.1.10, the <literal>DROP</literal> privilege is also
         required in order to use the statement <literal>ALTER TABLE ...
         DROP PARTITION</literal> on a partitioned table. Beginning with
-        MySQL 5.1.16/NDB-6.2.0, the <literal>DROP</literal> privilege is required
-        for <literal>TRUNCATE TABLE</literal> (before that,
+        MySQL 5.1.16/NDB-6.2.0, the <literal>DROP</literal> privilege is
+        required for <literal>TRUNCATE TABLE</literal> (before that,
         <literal>TRUNCATE TABLE</literal> requires the
         <literal>DELETE</literal> privilege). <emphasis>If you grant the
         <literal>DROP</literal> privilege for the

@@ -20336,7 +20340,8 @@
             (for example, <option>--debug=d,general,query</option>).
             This prints host and user information about attempted
             connections, as well as information about each command
-            issued. See <ulink url="http://dev.mysql.com/doc/internals/en/making-trace-files"/>.
+            issued. See
+            <ulink url="http://dev.mysql.com/doc/internals/en/making-trace-files"/>.
           </para>
         </listitem>
 

@@ -26595,10 +26600,10 @@
       </itemizedlist>
 
       <para>
-        If your system is one that has no zoneinfo database (one
-        example being HP-UX), you can use the package of pre-built
-        time zone tables that is available for download at the MySQL
-        Developer Zone:
+        If your system is one that has no zoneinfo database (one example
+        being HP-UX), you can use the package of pre-built time zone
+        tables that is available for download at the MySQL Developer
+        Zone:
       </para>
 
 <programlisting>


Modified: branches/telcos/refman-5.1/news-5.1.xml
===================================================================
--- branches/telcos/refman-5.1/news-5.1.xml	2007-03-12 13:42:08 UTC (rev 5302)
+++ branches/telcos/refman-5.1/news-5.1.xml	2007-03-12 13:45:24 UTC (rev 5303)
Changed blocks: 6, Lines Added: 20, Lines Deleted: 19; 3024 bytes

@@ -73,7 +73,7 @@
       and MySQL 5.1.15/NDB-6.1.3. This version also incorporates all
       bugfixes and feature changes which were added in the mainline
       MySQL 5.1 releases up to and including 5.1.16; information about
-      these can be found in <xref linkend="news-5-1-15"/>, and in 
+      these can be found in <xref linkend="news-5-1-15"/>, and in
       <xref linkend="news-5-1-16"/>.
     </para>
 

@@ -82,17 +82,18 @@
       devs have provided appropriate info.
     </remark>
 
-
     <important>
       <formalpara>
         <title>Upgrading to MySQL 5.1.16/NDB-6.2.0 from a previous release</title>
-        
+
+
+
         <para>
           This release is not binary compatible with previous releases.
-          This means that: 
-          
+          This means that:
+
           <itemizedlist>
-            
+
             <listitem>
               <para>
                 You cannot perform an online upgrade to this release

@@ -103,7 +104,7 @@
                 restart the cluster.
               </para>
             </listitem>
-            
+
             <listitem>
               <para>
                 You must recompile all NDB API and MGM API applications

@@ -111,28 +112,28 @@
                 those compiled against MySQL 5.1.15/NDB-6.1.3.
               </para>
             </listitem>
-            
+
           </itemizedlist>
         </para>
       </formalpara>
     </important>
-    
+
     <para>
       Functionality added or changed:
     </para>
-    
+
     <itemizedlist>
-      
+
       <listitem>
         <para>
-          A new option <option>--ndb-wait-connected</option> has
-          been added for <command>mysqld</command>. It causes
+          A new option <option>--ndb-wait-connected</option> has been
+          added for <command>mysqld</command>. It causes
           <command>mysqld</command> wait a specified amount of time to
           be connected to the cluster before starting to accept client
           connections. See <xref linkend="optvar_ndb-wait-connected"/>.
         </para>
       </listitem>
-      
+
       <listitem>
         <para>
           Data node memory allocation has been improved. On 32-bit

@@ -140,7 +141,7 @@
           for IndexMemory and DataMemory combined.
         </para>
       </listitem>
-      
+
     </itemizedlist>
 
     <para>

@@ -190,18 +191,18 @@
     </itemizedlist>
 
   </section>
-  
+
   <section id="news-5-1-16">
-    
+
     <title>Changes in release 5.1.16 (Not released separately for MySQL
       &current-series;)</title>
-    
+
     <para>
       This section documents all changes and bug fixes that were applied
       in MySQL 5.1.16 and subsequently incorporated into MySQL
       5.1.16/NDB-6.2.0 and later &current-series; releases.
     </para>
-    
+
     <para>
       Functionality added or changed:
     </para>


Thread
svn commit - mysqldoc@docsrva: r5303 - in branches/telcos: mysqld-optvars refman-5.1jon12 Mar