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

Log:
 r45779@frost:  paul | 2009-10-22 22:02:25 -0500
 Update 5.5 InnoDB chapter


Modified:
   trunk/dynamic-docs/changelog/mysqld-1.xml
   trunk/dynamic-docs/command-optvars/mysqld.xml
   trunk/refman-5.4/se-innodb-core.xml
   trunk/refman-5.5/se-innodb-core.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: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
   + 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:45779
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/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml	2009-10-23 03:16:32 UTC (rev 17273)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml	2009-10-23 03:16:40 UTC (rev 17274)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 425 bytes

@@ -67091,6 +67091,7 @@
 
     <versions>
       <version ver="5.1.36"/>
+      <version ver="5.4.2"/>
       <version ver="6.0.12"/>
     </versions>
 


Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2009-10-23 03:16:32 UTC (rev 17273)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2009-10-23 03:16:40 UTC (rev 17274)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 1; 852 bytes

@@ -9472,6 +9472,7 @@
       <manual version="5.1"/>
       <introduced version="5.1.33"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
     </versions>
 
   </mysqloption>

@@ -19402,7 +19403,7 @@
 
   </mysqloption>
 
-  <mysqloption section="server" id="sync-binlog">
+  <mysqloption section="server" id="sync_binlog">
 
     <xrefto id="sysvar_sync_binlog"/>
 

@@ -19433,6 +19434,7 @@
       <introduced version="5.0.1"/>
       <manual version="5.1"/>
       <manual version="5.4"/>
+      <manual version="5.5"/>
       <manual version="6.0"/>
     </versions>
 


Modified: trunk/refman-5.4/se-innodb-core.xml
===================================================================
--- trunk/refman-5.4/se-innodb-core.xml	2009-10-23 03:16:32 UTC (rev 17273)
+++ trunk/refman-5.4/se-innodb-core.xml	2009-10-23 03:16:40 UTC (rev 17274)
Changed blocks: 3, Lines Added: 22, Lines Deleted: 21; 3154 bytes

@@ -141,13 +141,14 @@
       </para>
 
       <para>
-        The <literal>InnoDB Plugin</literal> offers new features and
-        capabilities for flexibility and ease of use. Among these
-        features are improved performance and scalability, enhanced
-        reliability, <quote>Fast index creation,</quote> table and index
-        compression, file format management, new
-        <literal>INFORMATION_SCHEMA</literal> tables, capacity tuning,
-        multiple background I/O threads, and group commit.
+        The <literal>InnoDB Plugin</literal> offers new features,
+        improved performance and scalability, enhanced reliability and
+        new capabilities for flexibility and ease of use. Among the
+        features of the <literal>InnoDB Plugin</literal> are <quote>Fast
+        index creation,</quote> table and index compression, file format
+        management, new <literal>INFORMATION_SCHEMA</literal> tables,
+        capacity tuning, multiple background I/O threads, and group
+        commit.
       </para>
 
       <para>

@@ -1484,11 +1485,11 @@
         </para>
 
         <para>
-          As of MySQL 5.4.4, the value of
+          As of MySQL 5.4.2, the value of
           <literal role="sysvar">innodb_commit_concurrency</literal>
           cannot be changed at runtime from zero to nonzero or vice
-          versa. The value can still be changed from one nonzero value
-          to another.
+          versa. The value can be changed from one nonzero value to
+          another.
         </para>
       </listitem>
 

@@ -2537,29 +2538,29 @@
       </listitem>
 
       <listitem>
-        <para id="sysvar_innodb_write_io_threads">
-          <literal role="sysvar">innodb_write_io_threads</literal>
+        <para id="sysvar_innodb_version">
+          <literal role="sysvar">innodb_version</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_write_io_threads"/>
+        <para>
+          The <literal role="se">InnoDB</literal> version number.
+        </para>
 
         <para>
-          The number of I/O threads for write operations in
-          <literal>InnoDB</literal>. The default value is 4.
+          This variable was added in MySQL 5.4.2.
         </para>
       </listitem>
 
       <listitem>
-        <para id="sysvar_innodb_version">
-          <literal role="sysvar">innodb_version</literal>
+        <para id="sysvar_innodb_write_io_threads">
+          <literal role="sysvar">innodb_write_io_threads</literal>
         </para>
 
-        <para>
-          The <literal role="se">InnoDB</literal> version number.
-        </para>
+        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_write_io_threads"/>
 
         <para>
-          This variable was added in MySQL 5.4.2.
+          The number of I/O threads for write operations in
+          <literal>InnoDB</literal>. The default value is 4.
         </para>
       </listitem>
 


Modified: trunk/refman-5.5/se-innodb-core.xml
===================================================================
--- trunk/refman-5.5/se-innodb-core.xml	2009-10-23 03:16:32 UTC (rev 17273)
+++ trunk/refman-5.5/se-innodb-core.xml	2009-10-23 03:16:40 UTC (rev 17274)
Changed blocks: 44, Lines Added: 70, Lines Deleted: 122; 21237 bytes

@@ -62,7 +62,7 @@
     <xref linkend="show-engines"/>.
   </para>
 
-  <para condition="dynamic:storageengines:singlesummary" role="5.4:innodb">
+  <para condition="dynamic:storageengines:singlesummary" role="5.5:innodb">
     <citetitle><literal>InnoDB</literal> Storage Engine
     Features</citetitle>
   </para>

@@ -131,23 +131,22 @@
         At the 2008 MySQL User Conference, Innobase announced
         availability of an <literal>InnoDB</literal> Plugin for MySQL.
         This plugin for MySQL exploits the <quote>pluggable storage
-        engine</quote> architecture of MySQL. As of MySQL 5.4.2, the
-        <literal>InnoDB Plugin</literal> is included in MySQL
-        &current-series; releases. This version of the <literal>InnoDB
-        Plugin</literal> is 1.0.4 and is considered of Beta quality. It
-        becomes the built-in version of <literal>InnoDB</literal> in
-        MySQL Server, replacing the version previously included as the
-        built-in <literal>InnoDB</literal> engine.
+        engine</quote> architecture of MySQL. The <literal>InnoDB
+        Plugin</literal> is included in MySQL &current-series; releases
+        as the built-in version of <literal>InnoDB</literal>. This
+        version of the <literal>InnoDB Plugin</literal> is 1.0.5 and is
+        considered of Beta quality.
       </para>
 
       <para>
-        The <literal>InnoDB Plugin</literal> offers new features and
-        capabilities for flexibility and ease of use. Among these
-        features are improved performance and scalability, enhanced
-        reliability, <quote>Fast index creation,</quote> table and index
-        compression, file format management, new
-        <literal>INFORMATION_SCHEMA</literal> tables, capacity tuning,
-        multiple background I/O threads, and group commit.
+        The <literal>InnoDB Plugin</literal> offers new features,
+        improved performance and scalability, enhanced reliability and
+        new capabilities for flexibility and ease of use. Among the
+        features of the <literal>InnoDB Plugin</literal> are <quote>Fast
+        index creation,</quote> table and index compression, file format
+        management, new <literal>INFORMATION_SCHEMA</literal> tables,
+        capacity tuning, multiple background I/O threads, and group
+        commit.
       </para>
 
       <para>

@@ -157,11 +156,6 @@
         For general information about using <literal>InnoDB</literal> in
         MySQL, see <xref linkend="innodb"/>.
       </para>
-
-      <para>
-        For a specific list of changes in MySQL 5.4.2 compared to
-        earlier 5.4.x releases, see <xref linkend="news-5-4-2"/>.
-      </para>
     </listitem>
 
     <listitem>

@@ -1236,7 +1230,7 @@
 
     </formalpara>
 
-    <para condition="dynamic:optvar:fullsummary" role="5.4:mysqld:section-innodb">
+    <para condition="dynamic:optvar:fullsummary" role="5.5:mysqld:section-innodb">
       <citetitle><literal>InnoDB</literal> Option/Variable
       Reference</citetitle>
     </para>

@@ -1262,7 +1256,7 @@
           <option role="mysqld">--ignore-builtin-innodb</option>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:ignore-builtin-innodb"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:ignore-builtin-innodb"/>
 
         <para>
           This option that causes the server to behave as if the

@@ -1289,15 +1283,9 @@
         <para>
           Controls loading of the <literal>InnoDB</literal> storage
           engine, if the server was compiled with
-          <literal>InnoDB</literal> support. As of MySQL 5.4.2, this
-          option has a tristate format, with possible values of
-          <literal>OFF</literal>, <literal>ON</literal>, or
-          <literal>FORCE</literal>. Before MySQL 5.4.2, this is a
-          boolean option. Use <option role="mysqld">--innodb</option> to
-          enable or
-          <option role="mysqld" condition="innodb">--skip-innodb</option>
-          to disable <literal>InnoDB</literal>. See
-          <xref linkend="server-plugin-options"/>.
+          <literal>InnoDB</literal> support. This option has a tristate
+          format, with possible values of <literal>OFF</literal>,
+          <literal>ON</literal>, or <literal>FORCE</literal>.
         </para>
       </listitem>
 

@@ -1347,7 +1335,7 @@
           <literal role="sysvar">ignore_builtin_innodb</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:ignore_builtin_innodb"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:ignore_builtin_innodb"/>
 
         <para>
           Whether the server was started with the

@@ -1362,7 +1350,7 @@
           <literal role="sysvar">innodb_adaptive_hash_index</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_adaptive_hash_index"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_adaptive_hash_index"/>
 
         <para>
           Whether InnoDB adaptive hash indexes are enabled or disabled

@@ -1378,7 +1366,7 @@
           <literal role="sysvar">innodb_additional_mem_pool_size</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_additional_mem_pool_size"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_additional_mem_pool_size"/>
 
         <para>
           The size in bytes of a memory pool <literal>InnoDB</literal>

@@ -1397,7 +1385,7 @@
           <literal role="sysvar">innodb_autoextend_increment</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_autoextend_increment"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_autoextend_increment"/>
 
         <para>
           The increment size (in MB) for extending the size of an

@@ -1411,7 +1399,7 @@
           <literal role="sysvar">innodb_autoinc_lock_mode</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_autoinc_lock_mode"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_autoinc_lock_mode"/>
 
         <para>
           The locking mode to use for generating auto-increment values.

@@ -1433,7 +1421,7 @@
           <literal role="sysvar">innodb_buffer_pool_size</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_buffer_pool_size"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_buffer_pool_size"/>
 
         <para>
           The size in bytes of the memory buffer

@@ -1457,7 +1445,7 @@
           <literal role="sysvar">innodb_checksums</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_checksums"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_checksums"/>
 
         <para>
           <literal>InnoDB</literal> can use checksum validation on all

@@ -1475,7 +1463,7 @@
           <literal role="sysvar">innodb_commit_concurrency</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_commit_concurrency"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_commit_concurrency"/>
 
         <para>
           The number of threads that can commit at the same time. A

@@ -1484,11 +1472,11 @@
         </para>
 
         <para>
-          As of MySQL 5.4.4, the value of
+          The value of
           <literal role="sysvar">innodb_commit_concurrency</literal>
           cannot be changed at runtime from zero to nonzero or vice
-          versa. The value can still be changed from one nonzero value
-          to another.
+          versa. The value can be changed from one nonzero value to
+          another.
         </para>
       </listitem>
 

@@ -1497,7 +1485,7 @@
           <literal role="sysvar">innodb_concurrency_tickets</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_concurrency_tickets"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_concurrency_tickets"/>
 
         <para>
           The number of threads that can enter <literal>InnoDB</literal>

@@ -1522,7 +1510,7 @@
           <literal role="sysvar">innodb_data_file_path</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_data_file_path"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_data_file_path"/>
 
         <para>
           The paths to individual data files and their sizes. The full

@@ -1550,7 +1538,7 @@
           <literal role="sysvar">innodb_data_home_dir</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_data_home_dir"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_data_home_dir"/>
 
         <para>
           The common part of the directory path for all

@@ -1570,7 +1558,7 @@
           <literal role="sysvar">innodb_doublewrite</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_doublewrite"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_doublewrite"/>
 
         <para>
           If this variable is enabled (the default),

@@ -1584,34 +1572,11 @@
       </listitem>
 
       <listitem>
-        <para id="sysvar_innodb_extra_dirty_writes">
-          <literal role="sysvar">innodb_extra_dirty_writes</literal>
-        </para>
-
-        <para>
-          This variable is used in conjunction with
-          <literal role="sysvar">innodb_max_dirty_pages_pct</literal>.
-          The latter variable specifies the percentage of pages that
-          must be dirty before <literal role="se">InnoDB</literal>
-          flushes them. If
-          <literal role="sysvar">innodb_extra_dirty_writes</literal> is
-          enabled (the default), flushing of dirty pages may occur when
-          the server is idle, even if the percentage of dirty pages has
-          not reached the normally required percentage. This can help
-          reduce the amount of flushing that must be done when the
-          server is not idle and has fewer resources to spare. When
-          <literal role="sysvar">innodb_extra_dirty_writes</literal> is
-          disabled, extra flushing does not occur. This variable was
-          removed in MySQL 5.4.2.
-        </para>
-      </listitem>
-
-      <listitem>
         <para id="sysvar_innodb_fast_shutdown">
           <literal role="sysvar">innodb_fast_shutdown</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_fast_shutdown"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_fast_shutdown"/>
 
         <para>
           The <literal>InnoDB</literal> shutdown mode. By default, the

@@ -1634,7 +1599,7 @@
           <literal role="sysvar">innodb_file_per_table</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_file_per_table"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_file_per_table"/>
 
         <para>
           If <literal role="sysvar">innodb_file_per_table</literal> is

@@ -1653,7 +1618,7 @@
           <literal role="sysvar">innodb_flush_log_at_trx_commit</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_flush_log_at_trx_commit"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_flush_log_at_trx_commit"/>
 
         <para>
           If the value of

@@ -1717,7 +1682,7 @@
           <literal role="sysvar">innodb_flush_method</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_flush_method"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_flush_method"/>
 
         <remark role="note">
           In the source, there are also "normal" and "unbuffered" values

@@ -1774,7 +1739,7 @@
           <literal role="sysvar">innodb_force_recovery</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_force_recovery"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_force_recovery"/>
 
         <para>
           The crash recovery mode. Possible values are from 0 to 6. The

@@ -1798,7 +1763,7 @@
           <literal role="sysvar">innodb_io_capacity</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_io_capacity"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_io_capacity"/>
 
         <para>
           The maximum number of I/O operations per second that

@@ -1829,7 +1794,7 @@
           <literal role="sysvar">innodb_lock_wait_timeout</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_lock_wait_timeout"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_lock_wait_timeout"/>
 
         <para>
           The timeout in seconds an <literal>InnoDB</literal>

@@ -1872,7 +1837,7 @@
           <literal role="sysvar">innodb_locks_unsafe_for_binlog</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_locks_unsafe_for_binlog"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_locks_unsafe_for_binlog"/>
 
         <indexterm>
           <primary>InnoDB</primary>

@@ -2187,7 +2152,7 @@
           <literal role="sysvar">innodb_log_buffer_size</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_log_buffer_size"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_log_buffer_size"/>
 
         <para>
           The size in bytes of the buffer that <literal>InnoDB</literal>

@@ -2204,7 +2169,7 @@
           <literal role="sysvar">innodb_log_file_size</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_log_file_size"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_log_file_size"/>
 
         <para>
           The size in bytes of each log file in a log group. The

@@ -2224,7 +2189,7 @@
           <literal role="sysvar">innodb_log_files_in_group</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_log_files_in_group"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_log_files_in_group"/>
 
         <para>
           The number of log files in the log group.

@@ -2238,7 +2203,7 @@
           <literal role="sysvar">innodb_log_group_home_dir</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_log_group_home_dir"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_log_group_home_dir"/>
 
         <para>
           The directory path to the <literal>InnoDB</literal> log files.

@@ -2254,7 +2219,7 @@
           <literal role="sysvar">innodb_max_dirty_pages_pct</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_max_dirty_pages_pct"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_max_dirty_pages_pct"/>
 
         <para>
           This is an integer in the range from 0 to 99. The default

@@ -2266,24 +2231,11 @@
       </listitem>
 
       <listitem>
-        <para id="sysvar_innodb_max_merged_io">
-          <literal role="sysvar">innodb_max_merged_io</literal>
-        </para>
-
-        <para>
-          The maximum number of background I/O requests that will be
-          merged to issue a larger I/O request in a more contiguous
-          manner. The default value is 64. This variable was removed in
-          MySQL 5.4.2.
-        </para>
-      </listitem>
-
-      <listitem>
         <para id="sysvar_innodb_max_purge_lag">
           <literal role="sysvar">innodb_max_purge_lag</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_max_purge_lag"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_max_purge_lag"/>
 
         <para>
           This variable controls how to delay

@@ -2337,7 +2289,7 @@
           <literal role="sysvar">innodb_open_files</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_open_files"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_open_files"/>
 
         <para>
           This variable is relevant only if you use multiple tablespaces

@@ -2361,7 +2313,7 @@
           <literal role="sysvar">innodb_read_io_threads</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_read_io_threads"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_read_io_threads"/>
 
         <para>
           The number of I/O threads for read operations in

@@ -2374,7 +2326,7 @@
           <literal role="sysvar">innodb_rollback_on_timeout</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_rollback_on_timeout"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_rollback_on_timeout"/>
 
         <para>
           In MySQL &current-series;, <literal>InnoDB</literal> rolls

@@ -2392,7 +2344,7 @@
           <literal role="sysvar">innodb_stats_on_metadata</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_stats_on_metadata"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_stats_on_metadata"/>
 
         <para>
           When this variable is enabled (which is the default, as before

@@ -2418,7 +2370,7 @@
           <literal role="sysvar">innodb_support_xa</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_support_xa"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_support_xa"/>
 
         <para>
           When the variable is enabled (the default),

@@ -2439,13 +2391,12 @@
           <literal role="sysvar">innodb_sync_spin_loops</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_sync_spin_loops"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_sync_spin_loops"/>
 
         <para>
           The number of times a thread waits for an
           <literal>InnoDB</literal> mutex to be freed before the thread
-          is suspended. The default value is 30 as of MySQL 5.4.2, 20
-          before that.
+          is suspended. The default value is 30.
         </para>
       </listitem>
 

@@ -2454,7 +2405,7 @@
           <literal role="sysvar">innodb_table_locks</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_table_locks"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_table_locks"/>
 
         <para>
           If <literal role="sysvar">autocommit = 0</literal>,

@@ -2474,7 +2425,7 @@
           <literal role="sysvar">innodb_thread_concurrency</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_thread_concurrency"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_thread_concurrency"/>
 
         <para>
           <literal>InnoDB</literal> tries to keep the number of

@@ -2504,24 +2455,11 @@
       </listitem>
 
       <listitem>
-        <para id="sysvar_innodb_thread_concurrency_timer_based">
-          <literal role="sysvar">innodb_thread_concurrency_timer_based</literal>
-        </para>
-
-        <para>
-          Before MySQL 5.4.2, this variable controlled whether a
-          lock-free timer-based method of handling thread concurrency
-          was enabled. The concurrencly method and this variable were
-          removed in MySQL 5.4.2.
-        </para>
-      </listitem>
-
-      <listitem>
         <para id="sysvar_innodb_thread_sleep_delay">
           <literal role="sysvar">innodb_thread_sleep_delay</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_thread_sleep_delay"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_thread_sleep_delay"/>
 
         <para>
           How long <literal>InnoDB</literal> threads sleep before

@@ -2537,11 +2475,21 @@
       </listitem>
 
       <listitem>
+        <para id="sysvar_innodb_version">
+          <literal role="sysvar">innodb_version</literal>
+        </para>
+
+        <para>
+          The <literal role="se">InnoDB</literal> version number.
+        </para>
+      </listitem>
+
+      <listitem>
         <para id="sysvar_innodb_write_io_threads">
           <literal role="sysvar">innodb_write_io_threads</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:innodb_write_io_threads"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:innodb_write_io_threads"/>
 
         <para>
           The number of I/O threads for write operations in

@@ -2554,7 +2502,7 @@
           <literal role="sysvar">sync_binlog</literal>
         </para>
 
-        <para condition="dynamic:optvar:item" role="5.4:mysqld:sync_binlog"/>
+        <para condition="dynamic:optvar:item" role="5.5:mysqld:sync_binlog"/>
 
         <para>
           If the value of this variable is greater than 0, the MySQL


Thread
svn commit - mysqldoc@docsrva: r17274 - in trunk: . dynamic-docs/changelog dynamic-docs/command-optvars refman-5.4 refman-5.5paul.dubois23 Oct