List:Commits« Previous MessageNext Message »
From:paul.dubois Date:October 23 2009 3:16am
Subject:svn commit - mysqldoc@docsrva: r17273 - in trunk: . dynamic-docs/command-optvars
View as plain text  
Author: paul
Date: 2009-10-23 05:16:32 +0200 (Fri, 23 Oct 2009)
New Revision: 17273

Log:
 r45778@frost:  paul | 2009-10-22 21:38:25 -0500
 Add 5.1, 5.5 version numbers for InnoDB sysvars, statvars


Modified:
   trunk/dynamic-docs/command-optvars/mysqld.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:27364
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:45776
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:27364
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:45778
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546


Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2009-10-23 01:31:57 UTC (rev 17272)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2009-10-23 03:16:32 UTC (rev 17273)
Changed blocks: 91, Lines Added: 385, Lines Deleted: 265; 33008 bytes

@@ -9617,6 +9617,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -9643,8 +9644,11 @@
     </values>
 
     <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
       <manual version="5.4"/>
       <introduced version="5.4.2"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>

@@ -9682,6 +9686,7 @@
       <manual version="5.1"/>
       <introduced version="5.1.24"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
       <introduced version="6.0.5"/>
     </versions>

@@ -9729,6 +9734,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -9775,6 +9781,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -9804,6 +9811,7 @@
       <manual version="5.1"/>
       <introduced version="5.1.22"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -9899,6 +9907,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -9927,8 +9936,11 @@
     </values>
 
     <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
       <manual version="5.4"/>
       <introduced version="5.4.2"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>

@@ -9958,6 +9970,7 @@
       <introduced version="5.0.3"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -9989,6 +10002,7 @@
       <introduced version="5.0.12"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10023,6 +10037,7 @@
       <introduced version="5.0.3"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10053,6 +10068,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10083,6 +10099,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10111,11 +10128,40 @@
       <introduced version="5.0.3"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 
   </mysqloption>
 
+  <mysqloption section="innodb" id="innodb_extra_dirty_writes">
+
+    <xrefto id="sysvar_innodb_extra_dirty_writes"/>
+
+    <name>innodb_extra_dirty_writes</name>
+
+    <shortdescription>
+      Whether to flush dirty buffer pages when the percentage of dirty
+      pages is less than the maximum dirty percent
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--innodb_extra_dirty_writes=#" setvar="innodb_extra_dirty_writes"/>
+      <optype class="mycnf"/>
+      <vartype class="system" scope="global" isdynamic="no"/>
+    </types>
+
+    <values vartype="boolean" platform="all">
+      <value default="ON"/>
+    </values>
+
+    <versions>
+      <manual version="5.4"/>
+      <removed version="5.4.2"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption section="innodb" id="innodb_fast_shutdown">
 
     <xrefto id="sysvar_innodb_fast_shutdown"/>

@@ -10144,6 +10190,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10170,8 +10217,11 @@
     </values>
 
     <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
       <manual version="5.4"/>
       <introduced version="5.4.2"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>

@@ -10202,8 +10252,11 @@
     </values>
 
     <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
       <manual version="5.4"/>
       <introduced version="5.4.2"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>

@@ -10262,6 +10315,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10297,6 +10351,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10348,6 +10403,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10386,11 +10442,42 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 
   </mysqloption>
 
+  <mysqloption section="innodb" id="innodb_io_capacity">
+
+    <xrefto id="sysvar_innodb_io_capacity"/>
+
+    <name>innodb_io_capacity</name>
+
+    <shortdescription>
+      The limit on the maximum number of I/O operations per second
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--innodb_io_capacity=#" setvar="innodb_io_capacity"/>
+      <optype class="mycnf"/>
+      <vartype class="system" scope="global" isdynamic="no" outversion="5.4.1"/>
+      <vartype class="system" scope="global" isdynamic="yes" inversion="5.4.2"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="200"/>
+    </values>
+
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
+      <manual version="5.4"/>
+      <manual version="5.5"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption section="innodb" id="innodb_lock_wait_timeout">
 
     <xrefto id="sysvar_innodb_lock_wait_timeout"/>

@@ -10421,6 +10508,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10454,6 +10542,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10569,6 +10658,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10625,6 +10715,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10637,8 +10728,7 @@
     <name>innodb_log_files_in_group</name>
 
     <shortdescription>
-      Number of log files in the log group. InnoDB writes to the files
-      in a circular fashion. Value 3 is recommended here
+      Number of InnoDB log files in the log group
     </shortdescription>
 
     <types>

@@ -10671,6 +10761,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10700,6 +10791,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10739,11 +10831,40 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 
   </mysqloption>
 
+  <mysqloption section="innodb" id="innodb_max_merged_io">
+
+    <xrefto id="sysvar_innodb_max_merged_io"/>
+
+    <name>innodb_max_merged_io</name>
+
+    <shortdescription>
+      The maximum number of background I/O requests to merge to issue a
+      larger I/O request
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--innodb_max_merged_io=#" setvar="innodb_max_merged_io"/>
+      <optype class="mycnf"/>
+      <vartype class="system" scope="global" isdynamic="no"/>
+    </types>
+
+    <values vartype="numeric" platform="all">
+      <value default="64"/>
+    </values>
+
+    <versions>
+      <manual version="5.4"/>
+      <removed version="5.4.2"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption section="innodb" id="innodb_max_purge_lag">
 
     <xrefto id="sysvar_innodb_max_purge_lag"/>

@@ -10772,6 +10893,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10805,6 +10927,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10837,6 +10960,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10863,12 +10987,48 @@
     </values>
 
     <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
       <manual version="5.4"/>
       <introduced version="5.4.2"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>
 
+  <mysqloption section="innodb" id="innodb_read_io_threads">
+
+    <xrefto id="sysvar_innodb_read_io_threads"/>
+
+    <name>innodb_read_io_threads</name>
+
+    <shortdescription>
+      The number of background I/O threads for read prefetch requests
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--innodb_read_io_threads=#" setvar="innodb_read_io_threads"/>
+      <optype class="mycnf"/>
+      <vartype class="system" scope="global" isdynamic="no"/>
+    </types>
+
+    <values vartype="numeric" platform="all" outversion="5.4.2">
+      <value default="8"/>
+    </values>
+
+    <values vartype="numeric" platform="all" inversion="5.4.3">
+      <value default="4"/>
+    </values>
+
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
+      <manual version="5.4"/>
+      <manual version="5.5"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption section="innodb" id="innodb_replication_delay">
 
     <xrefto id="sysvar_innodb_replication_delay"/>

@@ -10890,8 +11050,11 @@
     </values>
 
     <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
       <manual version="5.4"/>
       <introduced version="5.4.2"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>

@@ -10920,6 +11083,7 @@
       <manual version="5.1"/>
       <introduced version="5.1.15"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -10982,6 +11146,7 @@
       <manual version="5.1"/>
       <introduced version="5.1.17"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -11011,6 +11176,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -11041,6 +11207,7 @@
       <introduced version="5.0.3"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -11079,6 +11246,7 @@
       <introduced version="5.0.3"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -11105,8 +11273,11 @@
     </values>
 
     <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
       <manual version="5.4"/>
       <introduced version="5.4.2"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>

@@ -11132,8 +11303,11 @@
     </values>
 
     <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
       <manual version="5.4"/>
       <introduced version="5.4.2"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>

@@ -11160,8 +11334,11 @@
     </values>
 
     <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
       <manual version="5.4"/>
       <introduced version="5.4.2"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>

@@ -11192,6 +11369,7 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -11242,11 +11420,39 @@
       <manual version="5.0"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 
   </mysqloption>
 
+  <mysqloption section="innodb" id="innodb_thread_concurrency_timer_based">
+
+    <xrefto id="sysvar_innodb_thread_concurrency_timer_based"/>
+
+    <name>innodb_thread_concurrency_timer_based</name>
+
+    <shortdescription>
+      Whether to use the lock-free method of handling thread concurrency
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--innodb_thread_concurrency_timer_based=#" setvar="innodb_thread_concurrency_timer_based"/>
+      <optype class="mycnf"/>
+      <vartype class="system" scope="global" isdynamic="no"/>
+    </types>
+
+    <values vartype="boolean" platform="all">
+      <value default="ON"/>
+    </values>
+
+    <versions>
+      <manual version="5.4"/>
+      <removed version="5.4.2"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption section="innodb" id="innodb_thread_sleep_delay">
 
     <xrefto id="sysvar_innodb_thread_sleep_delay"/>

@@ -11282,6 +11488,7 @@
       <introduced version="5.0.3"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -11339,8 +11546,11 @@
     </values>
 
     <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
       <manual version="5.4"/>
       <introduced version="5.4.2"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>

@@ -11366,10 +11576,45 @@
       <introduced version="5.1.38"/>
       <manual version="5.4"/>
       <introduced version="5.4.2"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>
 
+  <mysqloption section="innodb" id="innodb_write_io_threads">
+
+    <xrefto id="sysvar_innodb_write_io_threads"/>
+
+    <name>innodb_write_io_threads</name>
+
+    <shortdescription>
+      The number of background I/O threads for writing dirty pages from
+      the buffer cache to disk
+    </shortdescription>
+
+    <types>
+      <optype class="cmdline" format="--innodb_write_io_threads=#" setvar="innodb_write_io_threads"/>
+      <optype class="mycnf"/>
+      <vartype class="system" scope="global" isdynamic="no"/>
+    </types>
+
+    <values vartype="numeric" platform="all" outversion="5.4.2">
+      <value default="8"/>
+    </values>
+
+    <values vartype="numeric" platform="all" inversion="5.4.3">
+      <value default="4"/>
+    </values>
+
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
+      <manual version="5.4"/>
+      <manual version="5.5"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption section="server" id="insert_id">
 
     <xrefto id="sysvar_insert_id"/>

@@ -21682,6 +21927,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21708,6 +21954,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21734,6 +21981,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21760,6 +22008,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21786,6 +22035,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21813,6 +22063,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21839,6 +22090,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21865,6 +22117,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21891,6 +22144,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21917,6 +22171,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21944,6 +22199,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21970,6 +22226,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -21996,6 +22253,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22022,6 +22280,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22048,6 +22307,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22074,6 +22334,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22100,6 +22361,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22126,6 +22388,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22152,6 +22415,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22178,6 +22442,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22204,6 +22469,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22230,6 +22496,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22256,11 +22523,84 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 
   </mysqloption>
 
+  <mysqloption section="server" id="Innodb_have_sync_atomic">
+
+    <xrefto id="statvar_Innodb_have_sync_atomic"/>
+
+    <name>Innodb_have_sync_atomic</name>
+
+    <shortdescription>
+      Whether atomic instructions are available
+    </shortdescription>
+
+    <types>
+      <vartype class="status" isdynamic="no" scope="global"/>
+    </types>
+
+    <values vartype="numeric" platform="all"/>
+
+    <versions>
+      <manual version="5.4"/>
+      <removed version="5.4.2"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption section="server" id="Innodb_have_atomic_builtins">
+
+    <xrefto id="statvar_Innodb_have_atomic_builtins"/>
+
+    <name>Innodb_have_atomic_builtins</name>
+
+    <shortdescription>
+      Whether atomic instructions are available
+    </shortdescription>
+
+    <types>
+      <vartype class="status" isdynamic="no" scope="global"/>
+    </types>
+
+    <values vartype="numeric" platform="all"/>
+
+    <versions>
+      <manual version="5.1"/>
+      <introduced version="5.1.38"/>
+      <manual version="5.4"/>
+      <introduced version="5.4.2"/>
+      <manual version="5.5"/>
+    </versions>
+
+  </mysqloption>
+
+  <mysqloption section="server" id="Innodb_heap_enabled">
+
+    <xrefto id="statvar_Innodb_heap_enabled"/>
+
+    <name>Innodb_heap_enabled</name>
+
+    <shortdescription>
+      Whether the InnoDB memory heap is enabled
+    </shortdescription>
+
+    <types>
+      <vartype class="status" isdynamic="no" scope="global"/>
+    </types>
+
+    <values vartype="numeric" platform="all"/>
+
+    <versions>
+      <manual version="5.4"/>
+      <removed version="5.4.2"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption section="innodb" id="Innodb_log_waits">
 
     <xrefto id="statvar_Innodb_log_waits"/>

@@ -22283,6 +22623,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22309,6 +22650,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22335,6 +22677,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22361,6 +22704,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22387,6 +22731,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22413,6 +22758,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22439,6 +22785,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22465,6 +22812,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22491,6 +22839,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22517,6 +22866,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22543,6 +22893,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22569,6 +22920,7 @@
       <introduced version="5.0.3"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22595,6 +22947,7 @@
       <introduced version="5.0.3"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22621,6 +22974,7 @@
       <introduced version="5.0.3"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22647,6 +23001,7 @@
       <introduced version="5.0.3"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22673,6 +23028,7 @@
       <introduced version="5.0.3"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22699,6 +23055,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22725,6 +23082,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22751,6 +23109,7 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 

@@ -22777,11 +23136,35 @@
       <introduced version="5.0.2"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 
   </mysqloption>
 
+  <mysqloption section="server" id="Innodb_wake_ups">
+
+    <xrefto id="statvar_Innodb_wake_ups"/>
+
+    <name>Innodb_wake_ups</name>
+
+    <shortdescription>
+      The number of wakeups that should not occur
+    </shortdescription>
+
+    <types>
+      <vartype class="status" isdynamic="no" scope="global"/>
+    </types>
+
+    <values vartype="numeric" platform="all"/>
+
+    <versions>
+      <manual version="5.4"/>
+      <removed version="5.4.2"/>
+    </versions>
+
+  </mysqloption>
+
   <mysqloption section="ndb" id="Ndb_cluster_node_id">
 
     <xrefto id="statvar_Ndb_cluster_node_id"/>

@@ -24394,267 +24777,4 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="innodb_read_io_threads">
-
-    <xrefto id="sysvar_innodb_read_io_threads"/>
-
-    <name>innodb_read_io_threads</name>
-
-    <shortdescription>
-      The number of background I/O threads for read prefetch requests
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--innodb_read_io_threads=#" setvar="innodb_read_io_threads"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="global" isdynamic="no"/>
-    </types>
-
-    <values vartype="numeric" platform="all" outversion="5.4.2">
-      <value default="8"/>
-    </values>
-
-    <values vartype="numeric" platform="all" inversion="5.4.3">
-      <value default="4"/>
-    </values>
-
-    <versions>
-      <manual version="5.4"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="innodb" id="innodb_write_io_threads">
-
-    <xrefto id="sysvar_innodb_write_io_threads"/>
-
-    <name>innodb_write_io_threads</name>
-
-    <shortdescription>
-      The number of background I/O threads for writing dirty pages from
-      the buffer cache to disk
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--innodb_write_io_threads=#" setvar="innodb_write_io_threads"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="global" isdynamic="no"/>
-    </types>
-
-    <values vartype="numeric" platform="all" outversion="5.4.2">
-      <value default="8"/>
-    </values>
-
-    <values vartype="numeric" platform="all" inversion="5.4.3">
-      <value default="4"/>
-    </values>
-
-    <versions>
-      <manual version="5.4"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="innodb" id="innodb_max_merged_io">
-
-    <xrefto id="sysvar_innodb_max_merged_io"/>
-
-    <name>innodb_max_merged_io</name>
-
-    <shortdescription>
-      The maximum number of background I/O requests to merge to issue a
-      larger I/O request
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--innodb_max_merged_io=#" setvar="innodb_max_merged_io"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="global" isdynamic="no"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="64"/>
-    </values>
-
-    <versions>
-      <manual version="5.4"/>
-      <removed version="5.4.2"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="innodb" id="innodb_io_capacity">
-
-    <xrefto id="sysvar_innodb_io_capacity"/>
-
-    <name>innodb_io_capacity</name>
-
-    <shortdescription>
-      The limit on the maximum number of I/O operations per second
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--innodb_io_capacity=#" setvar="innodb_io_capacity"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="global" isdynamic="no" outversion="5.4.1"/>
-      <vartype class="system" scope="global" isdynamic="yes" inversion="5.4.2"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="200"/>
-    </values>
-
-    <versions>
-      <manual version="5.4"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="innodb" id="innodb_extra_dirty_writes">
-
-    <xrefto id="sysvar_innodb_extra_dirty_writes"/>
-
-    <name>innodb_extra_dirty_writes</name>
-
-    <shortdescription>
-      Whether to flush dirty buffer pages when the percentage of dirty
-      pages is less than the maximum dirty percent
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--innodb_extra_dirty_writes=#" setvar="innodb_extra_dirty_writes"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="global" isdynamic="no"/>
-    </types>
-
-    <values vartype="boolean" platform="all">
-      <value default="ON"/>
-    </values>
-
-    <versions>
-      <manual version="5.4"/>
-      <removed version="5.4.2"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="innodb" id="innodb_thread_concurrency_timer_based">
-
-    <xrefto id="sysvar_innodb_thread_concurrency_timer_based"/>
-
-    <name>innodb_thread_concurrency_timer_based</name>
-
-    <shortdescription>
-      Whether to use the lock-free method of handling thread concurrency
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--innodb_thread_concurrency_timer_based=#" setvar="innodb_thread_concurrency_timer_based"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="global" isdynamic="no"/>
-    </types>
-
-    <values vartype="boolean" platform="all">
-      <value default="ON"/>
-    </values>
-
-    <versions>
-      <manual version="5.4"/>
-      <removed version="5.4.2"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="server" id="Innodb_have_sync_atomic">
-
-    <xrefto id="statvar_Innodb_have_sync_atomic"/>
-
-    <name>Innodb_have_sync_atomic</name>
-
-    <shortdescription>
-      Whether atomic instructions are available
-    </shortdescription>
-
-    <types>
-      <vartype class="status" isdynamic="no" scope="global"/>
-    </types>
-
-    <values vartype="numeric" platform="all"/>
-
-    <versions>
-      <manual version="5.4"/>
-      <removed version="5.4.2"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="server" id="Innodb_have_atomic_builtins">
-
-    <xrefto id="statvar_Innodb_have_atomic_builtins"/>
-
-    <name>Innodb_have_atomic_builtins</name>
-
-    <shortdescription>
-      Whether atomic instructions are available
-    </shortdescription>
-
-    <types>
-      <vartype class="status" isdynamic="no" scope="global"/>
-    </types>
-
-    <values vartype="numeric" platform="all"/>
-
-    <versions>
-      <manual version="5.4"/>
-      <introduced version="5.4.2"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="server" id="Innodb_heap_enabled">
-
-    <xrefto id="statvar_Innodb_heap_enabled"/>
-
-    <name>Innodb_heap_enabled</name>
-
-    <shortdescription>
-      Whether the InnoDB memory heap is enabled
-    </shortdescription>
-
-    <types>
-      <vartype class="status" isdynamic="no" scope="global"/>
-    </types>
-
-    <values vartype="numeric" platform="all"/>
-
-    <versions>
-      <manual version="5.4"/>
-      <removed version="5.4.2"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="server" id="Innodb_wake_ups">
-
-    <xrefto id="statvar_Innodb_wake_ups"/>
-
-    <name>Innodb_wake_ups</name>
-
-    <shortdescription>
-      The number of wakeups that should not occur
-    </shortdescription>
-
-    <types>
-      <vartype class="status" isdynamic="no" scope="global"/>
-    </types>
-
-    <values vartype="numeric" platform="all"/>
-
-    <versions>
-      <manual version="5.4"/>
-      <removed version="5.4.2"/>
-    </versions>
-
-  </mysqloption>
-
 </mysqloptions>


Thread
svn commit - mysqldoc@docsrva: r17273 - in trunk: . dynamic-docs/command-optvarspaul.dubois23 Oct