Merge lp://staging/~sergei.glushchenko/percona-server/5.5-BT32840-ps-bug1196460 into lp://staging/percona-server/5.5
Proposed by
Sergei Glushchenko
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Laurynas Biveinis | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 553 | ||||
Proposed branch: | lp://staging/~sergei.glushchenko/percona-server/5.5-BT32840-ps-bug1196460 | ||||
Merge into: | lp://staging/percona-server/5.5 | ||||
Diff against target: |
179 lines (+32/-15) 11 files modified
Percona-Server/CMakeLists.txt (+1/-0) Percona-Server/cmake/dtrace.cmake (+4/-3) Percona-Server/cmake/plugin.cmake (+11/-4) Percona-Server/storage/archive/CMakeLists.txt (+2/-1) Percona-Server/storage/blackhole/CMakeLists.txt (+2/-1) Percona-Server/storage/csv/CMakeLists.txt (+2/-1) Percona-Server/storage/example/CMakeLists.txt (+2/-1) Percona-Server/storage/federated/CMakeLists.txt (+2/-1) Percona-Server/storage/heap/CMakeLists.txt (+2/-1) Percona-Server/storage/myisam/CMakeLists.txt (+2/-1) Percona-Server/storage/myisammrg/CMakeLists.txt (+2/-1) |
||||
To merge this branch: | bzr merge lp://staging/~sergei.glushchenko/percona-server/5.5-BT32840-ps-bug1196460 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Alexey Kopytov (community) | Approve | ||
Laurynas Biveinis (community) | Approve | ||
Review via email: mp+172579@code.staging.launchpad.net |
Description of the change
1. Introduce cmake option DISABLE_DTRACE
2. Invoke dtrace -G only for plugins and static libraries which need it
To post a comment you must log in.
http:// jenkins. percona. com/job/ percona- server- 5.5-param/ 783/