Merge lp://qastaging/~stewart/drizzle/move-timed-mutexes into lp://qastaging/drizzle
Proposed by
Stewart Smith
| Status: | Merged |
|---|---|
| Merged at revision: | 2628 |
| Proposed branch: | lp://qastaging/~stewart/drizzle/move-timed-mutexes |
| Merge into: | lp://qastaging/drizzle |
| Diff against target: |
230 lines (+24/-50) 11 files modified
docs/configuration/drizzled.rst (+0/-7) drizzled/drizzled.cc (+0/-9) drizzled/internal/my_static.cc (+0/-2) drizzled/internal/my_sys.h (+0/-2) drizzled/sys_var.cc (+0/-8) plugin/innobase/docs/index.rst (+8/-0) plugin/innobase/handler/ha_innodb.cc (+11/-0) plugin/innobase/include/sync0sync.h (+1/-1) plugin/innobase/sync/sync0sync.cc (+4/-0) tests/r/variables.result (+0/-14) tests/t/variables.test (+0/-7) |
| To merge this branch: | bzr merge lp://qastaging/~stewart/drizzle/move-timed-mutexes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Stewart Smith (community) | Approve | ||
| Drizzle Trunk | Pending | ||
|
Review via email:
|
|||
Description of the change
this option is really innodb only, so move it there. It's also only valid for UNIV_DEBUG, so only include it based on it.
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
discussed (and approved) with Brian over email