List:Commits« Previous MessageNext Message »
From:paul.dubois Date:January 8 2009 10:13pm
Subject:svn commit - mysqldoc@docsrva: r13049 - in trunk: . dynamic-docs/command-optvars
View as plain text  
Author: paul
Date: 2009-01-08 22:13:04 +0100 (Thu, 08 Jan 2009)
New Revision: 13049

Log:
 r37087@frost:  paul | 2009-01-08 15:05:00 -0500
 Dump the plugin_innodb_xxx stuff. We don't use it anywhere.


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

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:40875
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:37084
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:35335
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:40875
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:37087
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:35335


Modified: trunk/dynamic-docs/command-optvars/mysqld.xml
===================================================================
--- trunk/dynamic-docs/command-optvars/mysqld.xml	2009-01-08 21:12:53 UTC (rev 13048)
+++ trunk/dynamic-docs/command-optvars/mysqld.xml	2009-01-08 21:13:04 UTC (rev 13049)
Changed blocks: 35, Lines Added: 1, Lines Deleted: 1125; 36272 bytes

@@ -7004,7 +7004,7 @@
 
     <seealso xref="log-bin-trust-function-creators"/>
 
-    <seealso xref="plugin_innodb_locks_unsafe_for_binlog"/>
+    <seealso xref="innodb_locks_unsafe_for_binlog"/>
 
     <types>
       <optype class="mycnf" format="binlog-format" setvar="binlog_format"/>

@@ -9104,8 +9104,6 @@
       Enable InnoDB (if this version of MySQL supports it)
     </shortdescription>
 
-    <disabledby xref="skip-plugin-innodb"/>
-
     <types>
       <optype class="cmdline" format="--innodb"/>
       <optype class="mycnf"/>

@@ -9120,31 +9118,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin-innodb">
-
-    <xrefto id="option_mysqld_plugin-innodb"/>
-
-    <name>plugin-innodb</name>
-
-    <shortdescription lang="en">
-      Enable InnoDB (if this version of MySQL supports it)
-    </shortdescription>
-
-    <disabledby xref="skip-plugin-innodb"/>
-
-    <types>
-      <optype class="cmdline" format="--plugin-innodb"/>
-      <optype class="mycnf"/>
-    </types>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_adaptive_hash_index">
 
     <xrefto id="option_mysqld_innodb_adaptive_hash_index"/>

@@ -9215,34 +9188,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_additional_mem_pool_size">
-
-    <xrefto id="option_mysqld_plugin_innodb_additional_mem_pool_size"/>
-
-    <name>plugin_innodb_additional_mem_pool_size</name>
-
-    <shortdescription lang="en">
-      Size of a memory pool InnoDB uses to store data dictionary
-      information and other internal data structures
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_additional_mem_pool_size=#"
-        setvar="plugin_innodb_additional_mem_pool_size"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="both" isdynamic="no"/>
-    </types>
-
-    <values vartype="numeric" platform="all"></values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_autoextend_increment">
 
     <xrefto id="option_mysqld_innodb_autoextend_increment"/>

@@ -9277,35 +9222,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_autoextend_increment">
-
-    <xrefto id="option_mysqld_plugin_innodb_autoextend_increment"/>
-
-    <name>plugin_innodb_autoextend_increment</name>
-
-    <shortdescription lang="en">
-      Data file autoextend increment in megabytes
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_autoextend_increment=#"
-        setvar="plugin_innodb_autoextend_increment"/>
-      <optype class="mycnf"/>
-      <vartype class="system" isdynamic="yes" scope="both"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="8"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_autoinc_lock_mode">
 
     <xrefto id="option_mysqld_innodb_autoinc_lock_mode"/>

@@ -9370,38 +9286,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_buffer_pool_awe_mem_mb">
-
-    <xrefto id="option_mysqld_innodb_buffer_pool_awe_mem_mb"/>
-
-    <name>plugin_innodb_buffer_pool_awe_mem_mb</name>
-
-    <shortdescription lang="en">
-      If Windows AWE is used, the size in Megabytes of InnoDB buffer
-      pool allocated from the AWE memory
-    </shortdescription>
-
-    <platforms applies="windows"/>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_buffer_pool_awe_mem_mb=#"
-        setvar="innodb_buffer_pool_awe_mem_mb"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="both" isdynamic="no"/>
-    </types>
-
-    <values vartype="numeric" platform="windows">
-      <value default="0"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_buffer_pool_size">
 
     <xrefto id="option_mysqld_innodb_buffer_pool_size"/>

@@ -9436,38 +9320,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_buffer_pool_size">
-
-    <xrefto id="option_mysqld_plugin_innodb_buffer_pool_size"/>
-
-    <name>plugin_innodb_buffer_pool_size</name>
-
-    <shortdescription lang="en">
-      The size of the memory buffer InnoDB uses to cache data and
-      indexes of its tables
-    </shortdescription>
-
-    <platforms applies="windows"/>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_buffer_pool_size=#"
-        setvar="plugin_innodb_buffer_pool_size"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="both" isdynamic="no"/>
-    </types>
-
-    <values vartype="numeric" platform="windows">
-      <value default="8388608"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_checksums">
 
     <xrefto id="option_mysqld_innodb_checksums"/>

@@ -9478,8 +9330,6 @@
       Enable InnoDB checksums validation
     </shortdescription>
 
-    <disabledby xref="skip-plugin-innodb-checksums"/>
-
     <types>
       <optype class="cmdline" format="--innodb_checksums"
setvar="innodb_checksums"/>
       <optype class="mycnf"/>

@@ -9499,36 +9349,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_checksums">
-
-    <xrefto id="option_mysqld_plugin_innodb_checksums"/>
-
-    <name>plugin_innodb_checksums</name>
-
-    <shortdescription lang="en">
-      Enable InnoDB checksums validation
-    </shortdescription>
-
-    <disabledby xref="skip-plugin-innodb-checksums"/>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_checksums"
setvar="plugin_innodb_checksums"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="yes" scope="both" class="system"/>
-    </types>
-
-    <values vartype="boolean" platform="all">
-      <value default="ON"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <introduced version="5.1.18"/>
-      <manual version="6.0"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_safe_binlog">
 
     <xrefto id="option_mysqld_innodb_safe_binlog"/>

@@ -9588,33 +9408,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_commit_concurrency">
-
-    <xrefto id="option_mysqld_plugin_innodb_commit_concurrency"/>
-
-    <name>plugin_innodb_commit_concurrency</name>
-
-    <shortdescription lang="en">
-      Helps in performance tuning in heavily concurrent environments
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_commit_concurrency=#"
-        setvar="plugin_innodb_commit_concurrency"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="global" isdynamic="yes"/>
-    </types>
-
-    <values vartype="numeric" platform="all"/>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_concurrency_tickets">
 
     <xrefto id="option_mysqld_innodb_concurrency_tickets"/>

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

@@ -9707,34 +9470,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_data_file_path">
-
-    <xrefto id="option_mysqld_plugin_innodb_data_file_path"/>
-
-    <name>plugin_innodb_data_file_path</name>
-
-    <shortdescription lang="en">
-      Path to individual files and their sizes
-    </shortdescription>
-
-    <seealso xref="plugin_innodb_data_home_dir"/>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_data_file_path=name"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="global" isdynamic="no"/>
-    </types>
-
-    <values vartype="filename" platform="all"/>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_data_home_dir">
 
     <xrefto id="option_mysqld_innodb_data_home_dir"/>

@@ -9764,35 +9499,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_data_home_dir">
-
-    <xrefto id="option_mysqld_plugin_innodb_data_home_dir"/>
-
-    <name>plugin_innodb_data_home_dir</name>
-
-    <shortdescription lang="en">
-      The common part for InnoDB table spaces
-    </shortdescription>
-
-    <seealso xref="plugin_innodb_data_file_path"/>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_data_home_dir=name"
-        setvar="plugin_innodb_data_home_dir"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="global" isdynamic="no"/>
-    </types>
-
-    <values vartype="filename" platform="all"/>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_doublewrite">
 
     <xrefto id="option_mysqld_innodb_doublewrite"/>

@@ -9820,31 +9526,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin-innodb-doublewrite">
-
-    <xrefto id="option_mysqld_plugin-innodb-doublewrite"/>
-
-    <name>plugin-innodb-doublewrite</name>
-
-    <shortdescription lang="en">
-      Enable InnoDB doublewrite buffer
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin-innodb-doublewrite"
-        setvar="plugin_innodb_doublewrite"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_fast_shutdown">
 
     <xrefto id="option_mysqld_innodb_fast_shutdown"/>

@@ -9877,38 +9558,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_fast_shutdown">
-
-    <xrefto id="option_mysqld_plugin_innodb_fast_shutdown"/>
-
-    <name>plugin_innodb_fast_shutdown</name>
-
-    <shortdescription lang="en">
-      Speeds up the shutdown process of the InnoDB storage engine
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_fast_shutdown[=#]"
-        setvar="plugin_innodb_fast_shutdown"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="1"/>
-      <choice value="0"/>
-      <choice value="1"/>
-      <choice value="2"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_file_io_threads">
 
     <xrefto id="option_mysqld_innodb_file_io_threads"/>

@@ -9940,35 +9589,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_file_io_threads">
-
-    <xrefto id="option_mysqld_plugin_innodb_file_io_threads"/>
-
-    <name>plugin_innodb_file_io_threads</name>
-
-    <shortdescription lang="en">
-      Number of file I/O threads in InnoDB
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_file_io_threads=#"
-        setvar="plugin_innodb_file_io_threads"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="4"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_file_per_table">
 
     <xrefto id="option_mysqld_innodb_file_per_table"/>

@@ -9995,31 +9615,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_file_per_table">
-
-    <xrefto id="option_mysqld_plugin_innodb_file_per_table"/>
-
-    <name>plugin_innodb_file_per_table</name>
-
-    <shortdescription lang="en">
-      Stores each InnoDB table to an .ibd file in the database dir
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_file_per_table"
-        setvar="plugin_innodb_file_per_table"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_flush_log_at_trx_commit">
 
     <xrefto id="option_mysqld_innodb_flush_log_at_trx_commit"/>

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

@@ -10137,56 +9699,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_flush_method">
-
-    <xrefto id="option_mysqld_plugin_innodb_flush_method"/>
-
-    <name>plugin_innodb_flush_method</name>
-
-    <shortdescription lang="en">
-      With which method to flush data
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_flush_method=name"
-        setvar="plugin_innodb_flush_method"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <values vartype="enumeration" platform="windows">
-      <value default="async_unbuffered"/>
-    </values>
-
-    <values vartype="enumeration" platform="linux">
-      <value default="fdatasync"/>
-      <choice value="fdatasync"/>
-      <choice value="O_DSYNC"/>
-      <choice value="O_DIRECT"/>
-    </values>
-
-    <values vartype="enumeration" platform="hpux">
-      <value default="fdatasync"/>
-      <choice value="fdatasync"/>
-      <choice value="O_DSYNC"/>
-      <choice value="O_DIRECT"/>
-    </values>
-
-    <values vartype="enumeration" platform="solaris">
-      <value default="fdatasync"/>
-      <choice value="fdatasync"/>
-      <choice value="O_DSYNC"/>
-      <choice value="O_DIRECT"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_force_recovery">
 
     <xrefto id="option_mysqld_innodb_force_recovery"/>

@@ -10224,43 +9736,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_force_recovery">
-
-    <xrefto id="option_mysqld_plugin_innodb_force_recovery"/>
-
-    <name>plugin_innodb_force_recovery</name>
-
-    <shortdescription lang="en">
-      Helps to save your data in case the disk image of the database
-      becomes corrupt
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_force_recovery=#"
-        setvar="plugin_innodb_force_recovery"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <values vartype="enumeration" platform="all">
-      <value default="0"/>
-      <choice value="0"/>
-      <choice value="SRV_FORCE_IGNORE_CORRUPT"/>
-      <choice value="SRV_FORCE_NO_BACKGROUND"/>
-      <choice value="SRV_FORCE_NO_TRX_UNDO"/>
-      <choice value="SRV_FORCE_NO_IBUF_MERGE"/>
-      <choice value="SRV_FORCE_NO_UNDO_LOG_SCAN"/>
-      <choice value="SRV_FORCE_NO_LOG_REDO"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_lock_wait_timeout">
 
     <xrefto id="option_mysqld_innodb_lock_wait_timeout"/>

@@ -10294,36 +9769,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_lock_wait_timeout">
-
-    <xrefto id="option_mysqld_plugin_innodb_lock_wait_timeout"/>
-
-    <name>plugin_innodb_lock_wait_timeout</name>
-
-    <shortdescription lang="en">
-      Timeout in seconds an InnoDB transaction may wait for a lock
-      before being rolled back
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_lock_wait_timeout=#"
-        setvar="plugin_innodb_lock_wait_timeout"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" class="system" scope="global"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="50"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_locks_unsafe_for_binlog">
 
     <xrefto id="option_mysqld_innodb_locks_unsafe_for_binlog"/>

@@ -10356,36 +9801,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_locks_unsafe_for_binlog">
-
-    <xrefto id="option_mysqld_plugin_innodb_locks_unsafe_for_binlog"/>
-
-    <name>plugin_innodb_locks_unsafe_for_binlog</name>
-
-    <shortdescription lang="en">
-      Force InnoDB not to use next-key locking. Instead use only
-      row-level locking
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_locks_unsafe_for_binlog"
-        setvar="plugin_innodb_locks_unsafe_for_binlog"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <values vartype="boolean" platform="all">
-      <value default="FALSE"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_log_arch_dir">
 
     <xrefto id="option_mysqld_innodb_log_arch_dir"/>

@@ -10444,34 +9859,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_log_archive">
-
-    <xrefto id="option_mysqld_plugin_innodb_log_archive"/>
-
-    <name>plugin_innodb_log_archive</name>
-
-    <shortdescription lang="en">
-      Set to 1 if you want to have logs archived
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_log_archive[=#]"/>
-      <optype class="mycnf"/>
-      <vartype class="system" scope="global" isdynamic="no"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="0"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_log_buffer_size">
 
     <xrefto id="option_mysqld_innodb_log_buffer_size"/>

@@ -10504,36 +9891,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_log_buffer_size">
-
-    <xrefto id="option_mysqld_plugin_innodb_log_buffer_size"/>
-
-    <name>plugin_innodb_log_buffer_size</name>
-
-    <shortdescription lang="en">
-      The size of the buffer which InnoDB uses to write log to the log
-      files on disk
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_log_buffer_size=#"
-        setvar="plugin_innodb_log_buffer_size"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="1048576"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_log_file_size">
 
     <xrefto id="option_mysqld_innodb_log_file_size"/>

@@ -10565,35 +9922,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_log_file_size">
-
-    <xrefto id="option_mysqld_plugin_innodb_log_file_size"/>
-
-    <name>plugin_innodb_log_file_size</name>
-
-    <shortdescription lang="en">
-      Size of each log file in a log group
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_log_file_size=#"
-        setvar="plugin_innodb_log_file_size"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="5242880"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_log_files_in_group">
 
     <xrefto id="option_mysqld_innodb_log_files_in_group"/>

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

@@ -10685,33 +9983,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_log_group_home_dir">
-
-    <xrefto id="option_mysqld_plugin_innodb_log_group_home_dir"/>
-
-    <name>plugin_innodb_log_group_home_dir</name>
-
-    <shortdescription lang="en">
-      Path to InnoDB log files
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_log_group_home_dir=name"
-        setvar="plugin_innodb_log_group_home_dir"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <values vartype="filename" platform="all"/>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_max_dirty_pages_pct">
 
     <xrefto id="option_mysqld_innodb_max_dirty_pages_pct"/>

@@ -10742,35 +10013,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_max_dirty_pages_pct">
-
-    <xrefto id="option_mysqld_plugin_innodb_max_dirty_pages_pct"/>
-
-    <name>plugin_innodb_max_dirty_pages_pct</name>
-
-    <shortdescription lang="en">
-      Percentage of dirty pages allowed in bufferpool
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_max_dirty_pages_pct=#"
-        setvar="plugin_innodb_max_dirty_pages_pct"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="system" scope="global"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="90" maximum="100" minimum="0"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_max_purge_lag">
 
     <xrefto id="option_mysqld_innodb_max_purge_lag"/>

@@ -10803,35 +10045,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_max_purge_lag">
-
-    <xrefto id="option_mysqld_plugin_innodb_max_purge_lag"/>
-
-    <name>plugin_innodb_max_purge_lag</name>
-
-    <shortdescription lang="en">
-      Desired maximum length of the purge queue (0 = no limit)
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_max_purge_lag=#"
-        setvar="plugin_innodb_max_purge_lag"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="system" scope="global"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="0"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_mirrored_log_groups">
 
     <xrefto id="option_mysqld_innodb_mirrored_log_groups"/>

@@ -10864,35 +10077,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_mirrored_log_groups">
-
-    <xrefto id="option_mysqld_plugin_innodb_mirrored_log_groups"/>
-
-    <name>plugin_innodb_mirrored_log_groups</name>
-
-    <shortdescription lang="en">
-      Number of identical copies of log groups we keep for the database
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_mirrored_log_groups=#"
-        setvar="plugin_innodb_mirrored_log_groups"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="1"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_open_files">
 
     <xrefto id="option_mysqld_innodb_open_files"/>

@@ -10924,36 +10108,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_open_files">
-
-    <xrefto id="option_mysqld_plugin_innodb_open_files"/>
-
-    <name>plugin_innodb_open_files</name>
-
-    <shortdescription lang="en">
-      The maximum number of files that InnoDB keeps open at the same
-      time
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_open_files=#"
-        setvar="plugin_innodb_open_files"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" scope="global" class="system"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="300" minimum="10"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_rollback_on_timeout">
 
     <xrefto id="option_mysqld_innodb_rollback_on_timeout"/>

@@ -10982,32 +10136,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_rollback_on_timeout">
-
-    <xrefto id="option_mysqld_plugin_innodb_rollback_on_timeout"/>
-
-    <name>plugin_innodb_rollback_on_timeout</name>
-
-    <shortdescription lang="en">
-      Roll back entire transaction on transaction timeout, not just last
-      statement
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_rollback_on_timeout"
-        setvar="plugin_innodb_rollback_on_timeout"/>
-      <optype class="mycnf"/>
-      <vartype class="system" isdynamic="no"/>
-    </types>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_stats_on_metadata">
 
     <xrefto id="option_mysqld_innodb_stats_on_metadata"/>

@@ -11037,34 +10165,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_stats_on_metadata">
-
-    <name>plugin_innodb_stats_on_metadata</name>
-
-    <shortdescription lang="en">
-      Enable or disable InnoDB table statistics updates for metadata
-      statements
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_stats_on_metadata"
-        setvar="plugin_innodb_stats_on_metadata"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" class="system"/>
-    </types>
-
-    <values vartype="boolean" platform="all">
-      <value default="ON"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="innodb" id="innodb_status_file">
 
     <xrefto id="option_mysqld_innodb_status_file"/>

@@ -11263,182 +10363,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="plugin_innodb_status_file">
-
-    <xrefto id="option_mysqld_plugin_innodb_status_file"/>
-
-    <name>plugin_innodb_status_file</name>
-
-    <shortdescription lang="en">
-      Enable SHOW INNODB STATUS output in the innodb_status.[pid] file
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_status_file"
-        setvar="plugin_innodb_status_file"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="no" class="system"/>
-    </types>
-
-    <values vartype="boolean" platform="all">
-      <value default="FALSE"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="innodb" id="plugin_innodb_support_xa">
-
-    <xrefto id="option_mysqld_plugin_innodb_support_xa"/>
-
-    <name>plugin_innodb_support_xa</name>
-
-    <shortdescription lang="en">
-      Enable InnoDB support for the XA two-phase commit
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_support_xa"
setvar="plugin_innodb_support_xa"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="system" scope="both"/>
-    </types>
-
-    <values vartype="boolean" platform="all">
-      <value default="TRUE"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="innodb" id="plugin_innodb_sync_spin_loops">
-
-    <xrefto id="option_mysqld_plugin_innodb_sync_spin_loops"/>
-
-    <name>plugin_innodb_sync_spin_loops</name>
-
-    <shortdescription lang="en">
-      Count of spin-loop rounds in InnoDB mutexes
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_sync_spin_loops=#"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="system" scope="global"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="20"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="innodb" id="plugin_innodb_table_locks">
-
-    <xrefto id="option_mysqld_plugin_innodb_table_locks"/>
-
-    <name>innodb_table_locks</name>
-
-    <shortdescription lang="en">
-      Enable InnoDB locking in LOCK TABLES
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_table_locks"
-        setvar="plugin_innodb_table_locks"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="system" scope="both"/>
-    </types>
-
-    <values vartype="boolean" platform="all">
-      <value default="TRUE"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="innodb" id="plugin_innodb_thread_concurrency">
-
-    <xrefto id="option_mysqld_plugin_innodb_thread_concurrency"/>
-
-    <name>innodb_thread_concurrency</name>
-
-    <shortdescription lang="en">
-      Sets the maximum number of threads allowed inside InnoDB. Value 0
-      will disable the thread throttling
-    </shortdescription>
-
-    <seealso xref="plugin_innodb_concurrency_tickets"/>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_thread_concurrency=#"
-        setvar="plugin_innodb_thread_concurrency"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="system" scope="global"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="8"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="innodb" id="plugin_innodb_thread_sleep_delay">
-
-    <xrefto id="option_mysqld_plugin_innodb_thread_sleep_delay"/>
-
-    <name>plugin_innodb_thread_sleep_delay</name>
-
-    <shortdescription lang="en">
-      Time of innodb thread sleeping before joining InnoDB queue (usec).
-      Value 0 disable a sleep
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--plugin_innodb_thread_sleep_delay=#"
-        setvar="plugin_innodb_thread_sleep_delay"/>
-      <optype class="mycnf"/>
-      <vartype isdynamic="yes" class="system" scope="global"/>
-    </types>
-
-    <values vartype="numeric" platform="all">
-      <value default="8"/>
-    </values>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="server" id="insert_id">
 
     <xrefto id="sysvar_insert_id"/>

@@ -17018,54 +15942,6 @@
 
   </mysqloption>
 
-  <mysqloption section="innodb" id="skip-plugin-innodb">
-
-    <xrefto id="option_mysqld_skip-plugin-innodb"/>
-
-    <name>skip-plugin-innodb</name>
-
-    <shortdescription lang="en">
-      Skip InnoDB during startup
-    </shortdescription>
-
-    <types>
-      <optype class="cmdline" format="--skip-plugin-innodb"/>
-      <optype class="mycnf"/>
-    </types>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
-  <mysqloption section="innodb" id="skip-plugin-innodb-checksums">
-
-    <xrefto id="option_mysqld_skip-plugin-innodb_checksums"/>
-
-    <name>skip-plugin-innodb-checksums</name>
-
-    <shortdescription lang="en">
-      Disable InnoDB checksums validation
-    </shortdescription>
-
-    <seealso xref="innodb_checksums"/>
-
-    <types>
-      <optype class="cmdline" format="--skip-plugin-innodb-checksums"/>
-      <optype class="mycnf"/>
-    </types>
-
-    <versions>
-      <manual version="5.1"/>
-      <manual version="6.0"/>
-      <introduced version="5.1.18"/>
-    </versions>
-
-  </mysqloption>
-
   <mysqloption section="server" id="skip-locking">
 
     <xrefto id="option_mysqld_external-locking"/>


Thread
svn commit - mysqldoc@docsrva: r13049 - in trunk: . dynamic-docs/command-optvarspaul.dubois8 Jan 2009