Drizzle

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

  1. fix-bug-632589
  2. Merge into development
Proposed by Vijay Samuel
Status: Merged
Approved by: Brian Aker
Approved revision: 1750
Merged at revision: 1753
Proposed branch: lp:~vjsamuel/drizzle/fix-bug-632589
Merge into: lp:~drizzle-trunk/drizzle/development
Diff against target: 112 lines (+17/-17)
7 files modified
plugin/embedded_innodb/embedded_innodb_engine.cc (+11/-11)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_on-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_hash_index_on-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_enable-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_on-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_on-master.opt (+1/-1)
plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_on-master.opt (+1/-1)
To merge this branch: bzr merge lp:~vjsamuel/drizzle/fix-bug-632589
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+34875@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
3435static void init_options(drizzled::module::option_context &context)3435static void init_options(drizzled::module::option_context &context)
3436{3436{
3437 context("adaptive-hash-index", 3437 context("adaptive-hash-index",
3438 po::value<bool>(&innobase_adaptive_hash_index)->default_value(true),3438 po::value<bool>(&innobase_adaptive_hash_index)->default_value(true)->zero_tokens()->multitoken(),
3439 N_("Enable InnoDB adaptive hash index (enabled by default)."));3439 N_("Enable InnoDB adaptive hash index (enabled by default)."));
3440 context("adaptive-flushing",3440 context("adaptive-flushing",
3441 po::value<bool>(&srv_adaptive_flushing)->default_value(true),3441 po::value<bool>(&srv_adaptive_flushing)->default_value(true)->zero_tokens()->multitoken(),
3442 N_("Attempt flushing dirty pages to avoid IO bursts at checkpoints."));3442 N_("Attempt flushing dirty pages to avoid IO bursts at checkpoints."));
3443 context("additional-mem-pool-size",3443 context("additional-mem-pool-size",
3444 po::value<long>(&innobase_additional_mem_pool_size)->default_value(8*1024*1024L),3444 po::value<long>(&innobase_additional_mem_pool_size)->default_value(8*1024*1024L),
@@ -3453,11 +3453,11 @@
3453 po::value<string>(),3453 po::value<string>(),
3454 N_("The common part for InnoDB table spaces."));3454 N_("The common part for InnoDB table spaces."));
3455 context("checksums",3455 context("checksums",
3456 po::value<bool>(&innobase_use_checksums)->default_value(true),3456 po::value<bool>(&innobase_use_checksums)->default_value(true)->zero_tokens()->multitoken(),
3457 N_("Enable InnoDB checksums validation (enabled by default). Disable with --skip-innodb-checksums."));3457 N_("Enable InnoDB checksums validation (enabled by default)."));
3458 context("doublewrite",3458 context("doublewrite",
3459 po::value<bool>(&innobase_use_doublewrite)->default_value(true),3459 po::value<bool>(&innobase_use_doublewrite)->default_value(true)->zero_tokens()->multitoken(),
3460 N_("Enable InnoDB doublewrite buffer (enabled by default). Disable with --skip-innodb-doublewrite."));3460 N_("Enable InnoDB doublewrite buffer (enabled by default)."));
3461 context("io-capacity",3461 context("io-capacity",
3462 po::value<unsigned long>(&srv_io_capacity)->default_value(200),3462 po::value<unsigned long>(&srv_io_capacity)->default_value(200),
3463 N_("Number of IOPs the server can do. Tunes the background IO rate"));3463 N_("Number of IOPs the server can do. Tunes the background IO rate"));
@@ -3465,7 +3465,7 @@
3465 po::value<unsigned long>(&innobase_fast_shutdown)->default_value(1),3465 po::value<unsigned long>(&innobase_fast_shutdown)->default_value(1),
3466 N_("Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like)."));3466 N_("Speeds up the shutdown process of the InnoDB storage engine. Possible values are 0, 1 (faster) or 2 (fastest - crash-like)."));
3467 context("file-per-table", 3467 context("file-per-table",
3468 po::value<bool>(&srv_file_per_table)->default_value(false),3468 po::value<bool>(&srv_file_per_table)->default_value(false)->zero_tokens()->multitoken(),
3469 N_("Stores each InnoDB table to an .ibd file in the database dir."));3469 N_("Stores each InnoDB table to an .ibd file in the database dir."));
3470 context("file-format",3470 context("file-format",
3471 po::value<string>(),3471 po::value<string>(),
@@ -3513,7 +3513,7 @@
3513 po::value<unsigned long>(&srv_max_purge_lag)->default_value(0),3513 po::value<unsigned long>(&srv_max_purge_lag)->default_value(0),
3514 N_("Desired maximum length of the purge queue (0 = no limit)"));3514 N_("Desired maximum length of the purge queue (0 = no limit)"));
3515 context("rollback-on-timeout",3515 context("rollback-on-timeout",
3516 po::value<bool>(&innobase_rollback_on_timeout)->default_value(false),3516 po::value<bool>(&innobase_rollback_on_timeout)->default_value(false)->zero_tokens()->multitoken(),
3517 N_("Roll back the complete transaction on lock wait timeout, for 4.x compatibility (disabled by default)"));3517 N_("Roll back the complete transaction on lock wait timeout, for 4.x compatibility (disabled by default)"));
3518 context("open-files",3518 context("open-files",
3519 po::value<long>(&innobase_open_files)->default_value(300),3519 po::value<long>(&innobase_open_files)->default_value(300),
@@ -3525,16 +3525,16 @@
3525 po::value<unsigned long>(&innobase_write_io_threads)->default_value(4),3525 po::value<unsigned long>(&innobase_write_io_threads)->default_value(4),
3526 N_("Number of background write I/O threads in InnoDB."));3526 N_("Number of background write I/O threads in InnoDB."));
3527 context("print-verbose-log",3527 context("print-verbose-log",
3528 po::value<bool>(&innobase_print_verbose_log)->default_value(true),3528 po::value<bool>(&innobase_print_verbose_log)->default_value(true)->zero_tokens()->multitoken(),
3529 N_("Disable if you want to reduce the number of messages written to the log (default: enabled)."));3529 N_("Disable if you want to reduce the number of messages written to the log (default: enabled)."));
3530 context("status-file",3530 context("status-file",
3531 po::value<bool>(&innobase_create_status_file)->default_value(false),3531 po::value<bool>(&innobase_create_status_file)->default_value(false)->zero_tokens()->multitoken(),
3532 N_("Enable SHOW INNODB STATUS output in the log"));3532 N_("Enable SHOW INNODB STATUS output in the log"));
3533 context("sync-spin-loops",3533 context("sync-spin-loops",
3534 po::value<unsigned long>(&srv_n_spin_wait_rounds)->default_value(30L),3534 po::value<unsigned long>(&srv_n_spin_wait_rounds)->default_value(30L),
3535 N_("Count of spin-loop rounds in InnoDB mutexes (30 by default)"));3535 N_("Count of spin-loop rounds in InnoDB mutexes (30 by default)"));
3536 context("use-sys-malloc",3536 context("use-sys-malloc",
3537 po::value<bool>(&srv_use_sys_malloc)->default_value(true),3537 po::value<bool>(&srv_use_sys_malloc)->default_value(true)->zero_tokens()->multitoken(),
3538 N_("Use OS memory allocator instead of InnoDB's internal memory allocator"));3538 N_("Use OS memory allocator instead of InnoDB's internal memory allocator"));
3539}3539}
35403540
35413541
=== 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 @@
1--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.adaptive-flushing=true1--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.adaptive-flushing
22
=== 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 @@
1--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.adaptive-hash-index=true1--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.adaptive-hash-index
22
=== 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 @@
1--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.file-per-table=true1--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.file-per-table
22
=== 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 @@
1--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.print-verbose-log=true1--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.print-verbose-log
22
=== 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 @@
1--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.rollback-on-timeout=11--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.rollback-on-timeout
22
=== 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 @@
1--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.use-sys-malloc=11--plugin-add=embedded_innodb --plugin-remove=innobase --innodb.use-sys-malloc