Merge lp:~vjsamuel/drizzle/rplugin-embedded-innodb into lp:~drizzle-trunk/drizzle/development

[Vijay Samuel]

[Stewart Smith (stewart)]

Why is the default lock wait timeout being changed?

If we should change it, we should do it in a different patch..

review: Needs Fixing

=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.cc'
--- plugin/embedded_innodb/embedded_innodb_engine.cc	2010-08-08 17:17:30 +0000
+++ plugin/embedded_innodb/embedded_innodb_engine.cc	2010-08-10 11:53:44 +0000
@@ -102,7 +102,11 @@
 #include "drizzled/field/blob.h"
 #include "drizzled/field/enum.h"
 #include <drizzled/session.h>
+#include <boost/program_options.hpp>
+#include <drizzled/module/option_map.h>
+#include <iostream>
 
+namespace po= boost::program_options;
 #include <boost/algorithm/string.hpp>
 
 using namespace std;
@@ -2560,6 +2564,238 @@
 
 static int embedded_innodb_init(drizzled::module::Context &context)
 {
+
+  const module::option_map &vm= context.getOptions();
+  if (vm.count("additional-mem-pool-size"))
+  { 
+    if (innobase_additional_mem_pool_size > LONG_MAX || innobase_additional_mem_pool_size < 512*1024L)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of additional-mem-pool-size"));
+      exit(-1);
+    }
+    innobase_additional_mem_pool_size/= 1024;
+    innobase_additional_mem_pool_size*= 1024;
+  }
+
+  if (vm.count("autoextend-increment"))
+  { 
+    if (srv_auto_extend_increment > 1000L || srv_auto_extend_increment < 1L)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of autoextend-increment"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("buffer-pool-size"))
+  { 
+    if (innobase_buffer_pool_size > INT64_MAX || innobase_buffer_pool_size < 5*1024*1024L)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of buffer-pool-size"));
+      exit(-1);
+    }
+    innobase_buffer_pool_size/= 1024*1024L;
+    innobase_buffer_pool_size*= 1024*1024L;
+  }
+
+  if (vm.count("io-capacity"))
+  { 
+    if (srv_io_capacity > (unsigned long)~0L || srv_io_capacity < 100)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of io-capacity"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("fast-shutdown"))
+  { 
+    if (innobase_fast_shutdown > 2)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of fast-shutdown"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("flush-log-at-trx-commit"))
+  { 
+    if (srv_flush_log_at_trx_commit > 2)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of flush-log-at-trx-commit"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("force-recovery"))
+  { 
+    if (innobase_force_recovery > 6)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of force-recovery"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("log-file-size"))
+  { 
+    if (innodb_log_file_size > INT64_MAX || innodb_log_file_size < 1*1024*1024L)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of log-file-size"));
+      exit(-1);
+    }
+    innodb_log_file_size/= 1024*1024L;
+    innodb_log_file_size*= 1024*1024L;
+  }
+
+  if (vm.count("log-files-in-group"))
+  { 
+    if (innodb_log_files_in_group > 100 || innodb_log_files_in_group < 2)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of log-files-in-group"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("lock-wait-timeout"))
+  { 
+    if (innobase_lock_wait_timeout > 1024*1024*1024 || innobase_lock_wait_timeout < 1)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of lock-wait-timeout"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("log-buffer-size"))
+  { 
+    if (innobase_log_buffer_size > LONG_MAX || innobase_log_buffer_size < 256*1024L)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of log-buffer-size"));
+      exit(-1);
+    }
+    innobase_log_buffer_size/= 1024;
+    innobase_log_buffer_size*= 1024;
+  }
+
+  if (vm.count("lru-old-blocks-pct"))
+  { 
+    if (innobase_lru_old_blocks_pct > 95 || innobase_lru_old_blocks_pct < 5)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of lru-old-blocks-pct"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("lru-block-access-recency"))
+  { 
+    if (innobase_lru_block_access_recency > ULONG_MAX)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of lru-block-access-recency"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("max-dirty-pages-pct"))
+  { 
+    if (srv_max_buf_pool_modified_pct > 99)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of max-dirty-pages-pct"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("max-purge-lag"))
+  { 
+    if (srv_max_purge_lag > (unsigned long)~0L)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of max-purge-lag"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("open-files"))
+  { 
+    if (innobase_open_files > LONG_MAX || innobase_open_files < 10L)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of open-files"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("read-io-threads"))
+  { 
+    if (innobase_read_io_threads > 64 || innobase_read_io_threads < 1)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of read-io-threads"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("sync-spin-loops"))
+  { 
+    if (srv_n_spin_wait_rounds > (unsigned long)~0L)
+    {
+      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value of sync_spin_loops"));
+      exit(-1);
+    }
+  }
+
+  if (vm.count("data-home-dir"))
+  {
+    innobase_data_home_dir= strdup(vm["data-home-dir"].as<string>().c_str());
+  }
+
+  else
+  {
+    innobase_data_home_dir= NULL;
+  }
+
+  if (vm.count("file-format"))
+  {
+    innobase_file_format_name= strdup(vm["file-format"].as<string>().c_str());
+  }
+
+  else
+  {
+    innobase_file_format_name= (char *)"Barracuda";
+  }
+
+  if (vm.count("log-group-home-dir"))
+  {
+    innobase_log_group_home_dir= strdup(vm["log-group-home-dir"].as<string>().c_str());
+  }
+
+  else
+  {
+    innobase_log_group_home_dir= NULL;
+  }
+
+  if (vm.count("flush-method"))
+  {
+    innobase_unix_file_flush_method= strdup(vm["flush-method"].as<string>().c_str());
+  }
+
+  else
+  {
+    innobase_unix_file_flush_method= NULL;
+  }
+
+  if (vm.count("data-file-path"))
+  {
+    innodb_data_file_path= strdup(vm["data-file-path"].as<string>().c_str());
+  }
+
+  else
+  {
+    innodb_data_file_path= NULL;
+  }
+
+  if (vm.count("data-home-dir"))
+  {
+    innobase_data_home_dir= strdup(vm["data-home-dir"].as<string>().c_str());
+  }
+
+  else
+  {
+    innobase_data_home_dir= NULL;
+  }
+
   ib_err_t err;
 
   err= ib_init();
@@ -2960,7 +3196,7 @@
 static DRIZZLE_SYSVAR_ULONG(lock_wait_timeout, innobase_lock_wait_timeout,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.",
-  NULL, NULL, 50, 1, 1024 * 1024 * 1024, 0);
+  NULL, NULL, 5, 1, 1024 * 1024 * 1024, 0);
 
 static DRIZZLE_SYSVAR_LONG(log_buffer_size, innobase_log_buffer_size,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
@@ -3032,6 +3268,112 @@
   "Use OS memory allocator instead of InnoDB's internal memory allocator",
   NULL, NULL, true);
 
+static void init_options(drizzled::module::option_context &context)
+{
+  context("adaptive-hash-index", 
+          po::value<bool>(&innobase_adaptive_hash_index)->default_value(true),
+          N_("Enable InnoDB adaptive hash index (enabled by default)."));
+  context("adaptive-flushing",
+          po::value<bool>(&srv_adaptive_flushing)->default_value(true),
+          N_("Attempt flushing dirty pages to avoid IO bursts at checkpoints."));
+  context("additional-mem-pool-size",
+          po::value<long>(&innobase_additional_mem_pool_size)->default_value(8*1024*1024L),
+          N_("Size of a memory pool InnoDB uses to store data dictionary information and other internal data structures."));
+  context("autoextend-increment",
+          po::value<unsigned int>(&srv_auto_extend_increment)->default_value(8L),
+          N_("Data file autoextend increment in megabytes"));
+  context("buffer-pool-size",
+          po::value<int64_t>(&innobase_buffer_pool_size)->default_value(128*1024*1024L),
+          N_("The size of the memory buffer InnoDB uses to cache data and indexes of its tables."));
+  context("data-home-dir",
+          po::value<string>(),
+          N_("The common part for InnoDB table spaces."));
+  context("checksums",
+          po::value<bool>(&innobase_use_checksums)->default_value(true),
+          N_("Enable InnoDB checksums validation (enabled by default). Disable with --skip-innodb-checksums."));
+  context("doublewrite",
+          po::value<bool>(&innobase_use_doublewrite)->default_value(true),
+          N_("Enable InnoDB doublewrite buffer (enabled by default). Disable with --skip-innodb-doublewrite."));
+  context("io-capacity",
+          po::value<unsigned long>(&srv_io_capacity)->default_value(200),
+          N_("Number of IOPs the server can do. Tunes the background IO rate"));
+  context("fast-shutdown",
+          po::value<unsigned long>(&innobase_fast_shutdown)->default_value(1),
+          N_("Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like)."));
+  context("file-per-table", 
+          po::value<bool>(&srv_file_per_table)->default_value(false),
+          N_("Stores each InnoDB table to an .ibd file in the database dir."));
+  context("file-format",
+          po::value<string>(),
+          N_("File format to use for new tables in .ibd files."));
+  context("flush-log-at-trx-commit",
+          po::value<unsigned long>(&srv_flush_log_at_trx_commit)->default_value(1),
+          N_("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)."));
+  context("flush-method",
+          po::value<string>(),
+          N_("With which method to flush data."));
+  context("force-recovery",
+          po::value<long>(&innobase_force_recovery)->default_value(0),
+          N_("Helps to save your data in case the disk image of the database becomes corrupt."));        
+  context("data-file-path",
+          po::value<string>(),
+          N_("Path to individual files and their sizes."));
+  context("log-group-home-dir",
+          po::value<string>(),
+          N_("Path to individual files and their sizes."));
+  context("log-group-home-dir",
+          po::value<string>(),
+          N_("Path to InnoDB log files."));
+  context("log-file-size",
+          po::value<int64_t>(&innodb_log_file_size)->default_value(20*1024*1024L),
+          N_("Size of each log file in a log group."));
+  context("innodb-log-files-in-group",
+          po::value<int64_t>(&innodb_log_files_in_group)->default_value(2),
+          N_("Number of log files in the log group. InnoDB writes to the files in a circular fashion. Value 3 is recommended here."));
+  context("lock-wait-timeout",
+          po::value<unsigned long>(&innobase_lock_wait_timeout)->default_value(5),
+          N_("Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout."));
+  context("log-buffer-size",
+        po::value<long>(&innobase_log_buffer_size)->default_value(8*1024*1024L),
+        N_("The size of the buffer which InnoDB uses to write log to the log files on disk."));
+  context("lru-old-blocks-pct",
+          po::value<unsigned long>(&innobase_lru_old_blocks_pct)->default_value(37),
+          N_("Sets the point in the LRU list from where all pages are classified as old (Advanced users)"));
+  context("lru-block-access-recency",
+          po::value<unsigned long>(&innobase_lru_block_access_recency)->default_value(0),
+          N_("Milliseconds between accesses to a block at which it is made young. 0=disabled (Advanced users)"));
+  context("max-dirty-pages-pct",
+          po::value<unsigned long>(&srv_max_buf_pool_modified_pct)->default_value(75),
+          N_("Percentage of dirty pages allowed in bufferpool."));
+  context("max-purge-lag",
+          po::value<unsigned long>(&srv_max_purge_lag)->default_value(0),
+          N_("Desired maximum length of the purge queue (0 = no limit)"));
+  context("rollback-on-timeout",
+          po::value<bool>(&innobase_rollback_on_timeout)->default_value(false),
+          N_("Roll back the complete transaction on lock wait timeout, for 4.x compatibility (disabled by default)"));
+  context("open-files",
+          po::value<long>(&innobase_open_files)->default_value(300),
+          N_("How many files at the maximum InnoDB keeps open at the same time."));
+  context("read-io-threads",
+          po::value<unsigned long>(&innobase_read_io_threads)->default_value(4),
+          N_("Number of background read I/O threads in InnoDB."));
+  context("write-io-threads",
+          po::value<unsigned long>(&innobase_write_io_threads)->default_value(4),
+          N_("Number of background write I/O threads in InnoDB."));
+  context("print-verbose-log",
+          po::value<bool>(&innobase_print_verbose_log)->default_value(true),
+          N_("Disable if you want to reduce the number of messages written to the log (default: enabled)."));
+  context("status-file",
+          po::value<bool>(&innobase_create_status_file)->default_value(false),
+          N_("Enable SHOW INNODB STATUS output in the log"));
+  context("sync-spin-loops",
+          po::value<unsigned long>(&srv_n_spin_wait_rounds)->default_value(30L),
+          N_("Count of spin-loop rounds in InnoDB mutexes (30 by default)"));
+  context("use-sys-malloc",
+          po::value<bool>(&srv_use_sys_malloc)->default_value(true),
+          N_("Use OS memory allocator instead of InnoDB's internal memory allocator"));
+}
+
 static drizzle_sys_var* innobase_system_variables[]= {
   DRIZZLE_SYSVAR(adaptive_hash_index),
   DRIZZLE_SYSVAR(adaptive_flushing),
@@ -3079,6 +3421,6 @@
   PLUGIN_LICENSE_GPL,
   embedded_innodb_init,     /* Plugin Init */
   innobase_system_variables, /* system variables */
-  NULL                /* config options   */
+  init_options                /* config options   */
 }
 DRIZZLE_DECLARE_PLUGIN_END;
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_off-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_off-master.opt	2010-05-10 13:17:59 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_off-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-adaptive-flushing=false
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.adaptive-flushing=false
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt	2010-05-10 13:17:59 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-adaptive-flushing=true
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.adaptive-flushing=true
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_off-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_off-master.opt	2010-05-10 13:14:39 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_off-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-adaptive-hash-index=false
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.adaptive-hash-index=false
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_on-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_on-master.opt	2010-05-10 12:53:25 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_on-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-adaptive-hash-index=true
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.adaptive-hash-index=true
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_32m-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_32m-master.opt	2010-05-10 13:27:43 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_additional_mem_pool_size_32m-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-additional-mem-pool-size=32m
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.additional-mem-pool-size=33554432
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_42-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_42-master.opt	2010-05-10 13:56:23 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_42-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-autoextend-increment=42
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.autoextend-increment=42
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_22m-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_22m-master.opt	2010-05-10 14:02:46 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_22m-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-buffer-pool-size=20m
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.buffer-pool-size=20971520
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_disable-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_disable-master.opt	2010-04-30 05:50:45 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_disable-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --skip-innodb-checksums
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.checksums=false
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_enable-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_enable-master.opt	2010-04-30 05:50:45 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_enable-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase
+--plugin_add=embedded_innodb --plugin_remove=innobase 
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt	2010-05-03 04:14:08 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --skip-innodb-doublewrite
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.doublewrite=false
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt	2010-05-03 04:14:08 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-doublewrite
+--plugin_add=embedded_innodb --plugin_remove=innobase
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown0-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown0-master.opt	2010-05-03 13:41:05 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown0-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-fast-shutdown=0
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.fast-shutdown=0
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown1-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown1-master.opt	2010-05-03 13:41:05 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown1-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-fast-shutdown=1
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.fast-shutdown=1
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown2-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown2-master.opt	2010-05-03 13:41:05 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown2-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-fast-shutdown=2
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.fast-shutdown=2
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_disable-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_disable-master.opt	2010-05-03 14:13:17 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_disable-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-file-per-table=0
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.file-per-table=false
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_enable-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_enable-master.opt	2010-05-03 14:08:25 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_enable-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-file-per-table
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.file-per-table=true
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt	2010-05-05 04:24:23 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit0-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-log-at-trx-commit=0
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-log-at-trx-commit=0
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt	2010-05-05 04:24:23 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-log-at-trx-commit=1
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-log-at-trx-commit=1
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt	2010-05-05 04:24:23 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-log-at-trx-commit=2
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-log-at-trx-commit=2
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_fsync-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_fsync-master.opt	2010-05-06 09:50:02 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_fsync-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-method=fsync
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-method=fsync
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odirect-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odirect-master.opt	2010-05-06 09:50:02 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odirect-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-method=O_DIRECT
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-method=O_DIRECT
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odsync-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odsync-master.opt	2010-05-06 09:50:02 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odsync-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-flush-method=O_DSYNC
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.flush-method=O_DSYNC
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_force_recovery-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_force_recovery-master.opt	2010-05-11 05:11:20 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_force_recovery-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-force-recovery=1
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.force-recovery=1
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_io_capacity-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_io_capacity-master.opt	2010-05-03 12:27:00 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_io_capacity-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-io-capacity=500
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.io-capacity=500
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lock_wait_timeout_1-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lock_wait_timeout_1-master.opt	2010-05-11 05:19:48 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lock_wait_timeout_1-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-lock-wait-timeout=1
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.lock-wait-timeout=1
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_5m-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_5m-master.opt	2010-05-11 05:36:20 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_5m-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase  --innodb-log-buffer-size=5m
+--plugin_add=embedded_innodb --plugin_remove=innobase  --innodb.log-buffer-size=5242880
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct_50-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct_50-master.opt	2010-05-07 08:02:05 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct_50-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-max-dirty-pages-pct=50
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.max-dirty-pages-pct=50
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag_42-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag_42-master.opt	2010-05-07 12:15:41 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag_42-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-max-purge-lag=42
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.max-purge-lag=42
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_800-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_800-master.opt	2010-05-10 05:13:41 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_800-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-open-files=800
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.open-files=800
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_off-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_off-master.opt	2010-05-11 05:46:17 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_off-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-print-verbose-log=false
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.print-verbose-log=false
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_on-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_on-master.opt	2010-05-11 05:46:17 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_on-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-print-verbose-log=true
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.print-verbose-log=true
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt	2010-05-10 06:06:20 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_read_io_threads_64-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-read-io-threads=64
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.read-io-threads=64
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_off-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_off-master.opt	2010-05-11 07:09:35 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_off-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-rollback-on-timeout=false
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.rollback-on-timeout=false
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_on-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_on-master.opt	2010-05-11 07:09:35 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_on-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-rollback-on-timeout=1
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.rollback-on-timeout=1
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops_100-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops_100-master.opt	2010-05-11 07:29:33 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_sync_spin_loops_100-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-sync-spin-loops=100
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.sync-spin-loops=100
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_off-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_off-master.opt	2010-05-11 07:29:33 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_off-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-use-sys-malloc=0
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.use-sys-malloc=0
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_on-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_on-master.opt	2010-05-11 07:29:33 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_on-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-use-sys-malloc=1
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.use-sys-malloc=1
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt	2010-05-10 06:09:51 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-write-io-threads=64
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.write-io-threads=64
 
=== modified file 'plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format_file_per_table-master.opt'
--- plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format_file_per_table-master.opt	2010-06-07 08:46:37 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format_file_per_table-master.opt	2010-08-10 11:53:44 +0000
@@ -1,1 +1,1 @@
---plugin_add=embedded_innodb --plugin_remove=innobase --innodb-file-per-table=1
+--plugin_add=embedded_innodb --plugin_remove=innobase --innodb.file-per-table=1
 
=== modified file 'tests/test-run.pl'
--- tests/test-run.pl	2010-08-02 14:35:48 +0000
+++ tests/test-run.pl	2010-08-10 11:53:44 +0000
@@ -2592,9 +2592,7 @@
 	       $idx > 0 ? $idx + 101 : 1);
 
     mtr_add_arg($args,
-      "%s--loose-innodb_data_file_path=ibdata1:20M:autoextend", $prefix);
-
-    mtr_add_arg($args, "%s--loose-innodb-lock-wait-timeout=5", $prefix);
+      "%s--innodb.data-file-path=ibdata1:20M:autoextend", $prefix);
 
   }
   else