Merge lp://qastaging/~patrick-crews/drizzle/bug619946-test-speed-up into lp://qastaging/~drizzle-trunk/drizzle/development

Proposed by Patrick Crews
Status: Merged
Approved by: Brian Aker
Approved revision: 1729
Merged at revision: 1731
Proposed branch: lp://qastaging/~patrick-crews/drizzle/bug619946-test-speed-up
Merge into: lp://qastaging/~drizzle-trunk/drizzle/development
Diff against target: 168 lines (+42/-2)
8 files modified
plugin/transaction_log/tests/r/select_for_update.result (+6/-0)
plugin/transaction_log/tests/t/select_for_update.inc (+9/-0)
tests/include/mix1.inc (+5/-0)
tests/r/innodb-semi-consistent.result (+3/-0)
tests/r/innodb.result (+3/-0)
tests/r/innodb_mysql.result (+3/-0)
tests/t/innodb-semi-consistent.test (+7/-2)
tests/t/innodb.test (+6/-0)
To merge this branch: bzr merge lp://qastaging/~patrick-crews/drizzle/bug619946-test-speed-up
Reviewer Review Type Date Requested Status
Drizzle Merge Team Pending
Review via email: mp+33552@code.qastaging.launchpad.net

Description of the change

Sped up a few tests by reducing innodb_lock_wait_timeout. This saves us ~48 sec for each case where we expect to hit the lock timeout. Approx 4-5 minutes saved on my machine.

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
The diff is not available at this time. You can reload the page or download it.