Merge lp:~vjsamuel/drizzle/rplugin-embedded-innodb into lp:~drizzle-trunk/drizzle/development
Proposed by
Vijay Samuel
Status: | Merged |
---|---|
Merged at revision: | 1712 |
Proposed branch: | lp:~vjsamuel/drizzle/rplugin-embedded-innodb |
Merge into: | lp:~drizzle-trunk/drizzle/development |
Diff against target: |
672 lines (+384/-44) 41 files modified
plugin/embedded_innodb/embedded_innodb_engine.cc (+344/-2) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_adaptive_flushing_off-master.opt (+1/-1) 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_off-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_additional_mem_pool_size_32m-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_autoextend_increment_42-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_buffer_pool_size_22m-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_disable-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_checksums_enable-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_disable-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_doublewrite_enable-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown0-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown1-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_fast_shutdown2-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_file_per_table_disable-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_flush_log_at_trx_commit0-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit1-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_log_at_trx_commit2-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_fsync-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odirect-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_flush_method_odsync-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_force_recovery-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_io_capacity-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_lock_wait_timeout_1-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_log_buffer_size_5m-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_dirty_pages_pct_50-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_max_purge_lag_42-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_open_files_800-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_print_verbose_log_off-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_read_io_threads_64-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_rollback_on_timeout_off-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_sync_spin_loops_100-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_off-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_use_sys_malloc_on-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/config_write_io_threads_64-master.opt (+1/-1) plugin/embedded_innodb/test-suite-dir/embedded_innodb/tests/t/row_format_file_per_table-master.opt (+1/-1) tests/test-run.pl (+1/-3) |
To merge this branch: | bzr merge lp:~vjsamuel/drizzle/rplugin-embedded-innodb |
Related bugs: | |
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Stewart Smith (community) | Needs Fixing | ||
Drizzle Merge Team | Pending | ||
Review via email:
|
To post a comment you must log in.
Why is the default lock wait timeout being changed?
If we should change it, we should do it in a different patch..