Merge lp:~vjsamuel/drizzle/fix-bug-632589 into lp:~drizzle-trunk/drizzle/development

[Vijay Samuel]

=== modified file 'plugin/embedded_innodb/embedded_innodb_engine.cc'
--- plugin/embedded_innodb/embedded_innodb_engine.cc	2010-08-17 03:04:15 +0000
+++ plugin/embedded_innodb/embedded_innodb_engine.cc	2010-09-08 16:27:45 +0000
@@ -3435,10 +3435,10 @@
 static void init_options(drizzled::module::option_context &context)
 {
   context("adaptive-hash-index", 
-          po::value<bool>(&innobase_adaptive_hash_index)->default_value(true),
+          po::value<bool>(&innobase_adaptive_hash_index)->default_value(true)->zero_tokens()->multitoken(),
           N_("Enable InnoDB adaptive hash index (enabled by default)."));
   context("adaptive-flushing",
-          po::value<bool>(&srv_adaptive_flushing)->default_value(true),
+          po::value<bool>(&srv_adaptive_flushing)->default_value(true)->zero_tokens()->multitoken(),
           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),
@@ -3453,11 +3453,11 @@
           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."));
+          po::value<bool>(&innobase_use_checksums)->default_value(true)->zero_tokens()->multitoken(),
+          N_("Enable InnoDB checksums validation (enabled by default)."));
   context("doublewrite",
-          po::value<bool>(&innobase_use_doublewrite)->default_value(true),
-          N_("Enable InnoDB doublewrite buffer (enabled by default). Disable with --skip-innodb-doublewrite."));
+          po::value<bool>(&innobase_use_doublewrite)->default_value(true)->zero_tokens()->multitoken(),
+          N_("Enable InnoDB doublewrite buffer (enabled by default)."));
   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"));
@@ -3465,7 +3465,7 @@
           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),
+          po::value<bool>(&srv_file_per_table)->default_value(false)->zero_tokens()->multitoken(),
           N_("Stores each InnoDB table to an .ibd file in the database dir."));
   context("file-format",
           po::value<string>(),
@@ -3513,7 +3513,7 @@
           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),
+          po::value<bool>(&innobase_rollback_on_timeout)->default_value(false)->zero_tokens()->multitoken(),
           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),
@@ -3525,16 +3525,16 @@
           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),
+          po::value<bool>(&innobase_print_verbose_log)->default_value(true)->zero_tokens()->multitoken(),
           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),
+          po::value<bool>(&innobase_create_status_file)->default_value(false)->zero_tokens()->multitoken(),
           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),
+          po::value<bool>(&srv_use_sys_malloc)->default_value(true)->zero_tokens()->multitoken(),
           N_("Use OS memory allocator instead of InnoDB's internal memory allocator"));
 }
 

=== 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-08-19 18:07:50 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt	2010-09-08 16:27:45 +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

=== 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-08-19 18:07:50 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_on-master.opt	2010-09-08 16:27:45 +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

=== 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-08-19 18:07:50 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_enable-master.opt	2010-09-08 16:27:45 +0000
@@ -1,1 +1,1 @@
---plugin-add=embedded_innodb --plugin-remove=innobase --innodb.file-per-table=true
+--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.file-per-table

=== 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-08-19 18:07:50 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_on-master.opt	2010-09-08 16:27:45 +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

=== 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-08-19 18:07:50 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_on-master.opt	2010-09-08 16:27:45 +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

=== 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-08-19 18:07:50 +0000
+++ plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_on-master.opt	2010-09-08 16:27:45 +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