Merge lp:~sergei.glushchenko/percona-server/5.6-BT32840-ps-bug1196460 into lp:percona-server/5.6

Proposed by Sergei Glushchenko
Status: Merged
Approved by: Laurynas Biveinis
Approved revision: 400
Merged at revision: 404
Proposed branch: lp:~sergei.glushchenko/percona-server/5.6-BT32840-ps-bug1196460
Merge into: lp:percona-server/5.6
Diff against target: 188 lines (+32/-16)
12 files modified
Percona-Server/CMakeLists.txt (+1/-0)
Percona-Server/cmake/dtrace.cmake (+4/-3)
Percona-Server/cmake/plugin.cmake (+11/-4)
Percona-Server/mysys_ssl/CMakeLists.txt (+0/-1)
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:~sergei.glushchenko/percona-server/5.6-BT32840-ps-bug1196460
Reviewer Review Type Date Requested Status
Alexey Kopytov (community) Approve
Laurynas Biveinis (community) Approve
Review via email: mp+172581@code.launchpad.net
To post a comment you must log in.

Same question as for the 5.5 MP.

review: Needs Information
review: Approve
Alexey Kopytov (akopytov) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Percona-Server/CMakeLists.txt'
2--- Percona-Server/CMakeLists.txt 2013-06-25 13:13:06 +0000
3+++ Percona-Server/CMakeLists.txt 2013-07-08 14:19:34 +0000
4@@ -207,6 +207,7 @@
5 SET(WITHOUT_DYNAMIC_PLUGINS 1)
6 ENDIF()
7 OPTION(ENABLED_PROFILING "Enable profiling" ON)
8+OPTION(ENABLE_DTRACE "Include support for DTrace probes" OFF)
9 OPTION(CYBOZU "" OFF)
10 OPTION(BACKUP_TEST "" OFF)
11 OPTION(WITHOUT_SERVER OFF)
12
13=== modified file 'Percona-Server/cmake/dtrace.cmake'
14--- Percona-Server/cmake/dtrace.cmake 2013-05-12 06:24:46 +0000
15+++ Percona-Server/cmake/dtrace.cmake 2013-07-08 14:19:34 +0000
16@@ -35,10 +35,11 @@
17 MARK_AS_ADVANCED(DTRACE)
18
19 # On FreeBSD, dtrace does not handle userland tracing yet
20- IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
21- AND NOT BUGGY_GCC_NO_DTRACE_MODULES)
22- SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
23+ IF(ENABLE_DTRACE AND (CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
24+ OR BUGGY_GCC_NO_DTRACE_MODULES OR NOT DTRACE))
25+ MESSAGE(FATAL_ERROR "dtrace is not supported on this system")
26 ENDIF()
27+
28 SET(HAVE_DTRACE ${ENABLE_DTRACE})
29 IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
30 IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
31
32=== modified file 'Percona-Server/cmake/plugin.cmake'
33--- Percona-Server/cmake/plugin.cmake 2013-02-26 05:45:28 +0000
34+++ Percona-Server/cmake/plugin.cmake 2013-07-08 14:19:34 +0000
35@@ -21,6 +21,7 @@
36 # [STORAGE_ENGINE]
37 # [MANDATORY|DEFAULT]
38 # [STATIC_ONLY|DYNAMIC_ONLY]
39+# [DTRACE_INSTRUMENTED]
40 # [MODULE_OUTPUT_NAME module_name]
41 # [STATIC_OUTPUT_NAME static_name]
42 # [RECOMPILE_FOR_EMBEDDED]
43@@ -47,7 +48,7 @@
44 MACRO(MYSQL_ADD_PLUGIN)
45 MYSQL_PARSE_ARGUMENTS(ARG
46 "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME"
47- "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED"
48+ "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED;DTRACE_INSTRUMENTED"
49 ${ARGN}
50 )
51
52@@ -116,7 +117,9 @@
53 IF (WITH_${plugin} AND NOT ARG_MODULE_ONLY)
54 ADD_LIBRARY(${target} STATIC ${SOURCES})
55 SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITONS "MYSQL_SERVER")
56- DTRACE_INSTRUMENT(${target})
57+ IF (ARG_DTRACE_INSTRUMENTED)
58+ DTRACE_INSTRUMENT(${target})
59+ ENDIF()
60 ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
61 IF(WITH_EMBEDDED_SERVER)
62 # Embedded library should contain PIC code and be linkable
63@@ -124,7 +127,9 @@
64 IF(ARG_RECOMPILE_FOR_EMBEDDED OR NOT _SKIP_PIC)
65 # Recompile some plugins for embedded
66 ADD_CONVENIENCE_LIBRARY(${target}_embedded ${SOURCES})
67- DTRACE_INSTRUMENT(${target}_embedded)
68+ IF (ARG_DTRACE_INSTRUMENTED)
69+ DTRACE_INSTRUMENT(${target}_embedded)
70+ ENDIF()
71 IF(ARG_RECOMPILE_FOR_EMBEDDED)
72 SET_TARGET_PROPERTIES(${target}_embedded
73 PROPERTIES COMPILE_DEFINITIONS "MYSQL_SERVER;EMBEDDED_LIBRARY")
74@@ -170,7 +175,9 @@
75
76 ADD_VERSION_INFO(${target} MODULE SOURCES)
77 ADD_LIBRARY(${target} MODULE ${SOURCES})
78- DTRACE_INSTRUMENT(${target})
79+ IF (ARG_DTRACE_INSTRUMENTED)
80+ DTRACE_INSTRUMENT(${target})
81+ ENDIF()
82 SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX ""
83 COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
84 TARGET_LINK_LIBRARIES (${target} mysqlservices)
85
86=== modified file 'Percona-Server/mysys_ssl/CMakeLists.txt'
87--- Percona-Server/mysys_ssl/CMakeLists.txt 2013-02-18 12:44:49 +0000
88+++ Percona-Server/mysys_ssl/CMakeLists.txt 2013-07-08 14:19:34 +0000
89@@ -47,4 +47,3 @@
90
91 ADD_CONVENIENCE_LIBRARY(mysys_ssl ${MYSYS_SSL_SOURCES})
92 TARGET_LINK_LIBRARIES(mysys_ssl dbug strings ${SSL_LIBRARIES} ${ZLIB_LIBRARY})
93-DTRACE_INSTRUMENT(mysys_ssl)
94
95=== modified file 'Percona-Server/storage/archive/CMakeLists.txt'
96--- Percona-Server/storage/archive/CMakeLists.txt 2011-09-07 10:08:09 +0000
97+++ Percona-Server/storage/archive/CMakeLists.txt 2013-07-08 14:19:34 +0000
98@@ -14,5 +14,6 @@
99 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
100
101 SET(ARCHIVE_SOURCES azio.c ha_archive.cc ha_archive.h)
102-MYSQL_ADD_PLUGIN(archive ${ARCHIVE_SOURCES} STORAGE_ENGINE LINK_LIBRARIES ${ZLIB_LIBRARY})
103+MYSQL_ADD_PLUGIN(archive ${ARCHIVE_SOURCES} STORAGE_ENGINE
104+ LINK_LIBRARIES ${ZLIB_LIBRARY} DTRACE_INSTRUMENTED)
105
106
107=== modified file 'Percona-Server/storage/blackhole/CMakeLists.txt'
108--- Percona-Server/storage/blackhole/CMakeLists.txt 2011-09-07 10:08:09 +0000
109+++ Percona-Server/storage/blackhole/CMakeLists.txt 2013-07-08 14:19:34 +0000
110@@ -14,4 +14,5 @@
111 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
112
113 SET(BLACKHOLE_SOURCES ha_blackhole.cc ha_blackhole.h)
114-MYSQL_ADD_PLUGIN(blackhole ${BLACKHOLE_SOURCES} STORAGE_ENGINE)
115+MYSQL_ADD_PLUGIN(blackhole ${BLACKHOLE_SOURCES} STORAGE_ENGINE
116+ DTRACE_INSTRUMENTED)
117
118=== modified file 'Percona-Server/storage/csv/CMakeLists.txt'
119--- Percona-Server/storage/csv/CMakeLists.txt 2011-09-07 10:08:09 +0000
120+++ Percona-Server/storage/csv/CMakeLists.txt 2013-07-08 14:19:34 +0000
121@@ -17,4 +17,5 @@
122 SET(CSV_PLUGIN_MANDATORY TRUE)
123
124 SET(CSV_SOURCES ha_tina.cc ha_tina.h transparent_file.cc transparent_file.h)
125-MYSQL_ADD_PLUGIN(csv ${CSV_SOURCES} STORAGE_ENGINE MANDATORY)
126+MYSQL_ADD_PLUGIN(csv ${CSV_SOURCES} STORAGE_ENGINE
127+ MANDATORY DTRACE_INSTRUMENTED)
128
129=== modified file 'Percona-Server/storage/example/CMakeLists.txt'
130--- Percona-Server/storage/example/CMakeLists.txt 2011-09-07 10:08:09 +0000
131+++ Percona-Server/storage/example/CMakeLists.txt 2013-07-08 14:19:34 +0000
132@@ -15,4 +15,5 @@
133
134 SET(EXAMPLE_PLUGIN_DYNAMIC "ha_example")
135 SET(EXAMPLE_SOURCES ha_example.cc)
136-MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE MODULE_ONLY)
137+MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE MODULE_ONLY
138+ DTRACE_INSTRUMENTED)
139
140=== modified file 'Percona-Server/storage/federated/CMakeLists.txt'
141--- Percona-Server/storage/federated/CMakeLists.txt 2011-09-07 10:08:09 +0000
142+++ Percona-Server/storage/federated/CMakeLists.txt 2013-07-08 14:19:34 +0000
143@@ -21,4 +21,5 @@
144 # mysqld and are optimized away by the linker.
145 SET(FEDERATED_SOURCES ${FEDERATED_SOURCES} ${CMAKE_SOURCE_DIR}/mysys/string.c)
146 ENDIF()
147-MYSQL_ADD_PLUGIN(federated ${FEDERATED_SOURCES} STORAGE_ENGINE)
148+MYSQL_ADD_PLUGIN(federated ${FEDERATED_SOURCES} STORAGE_ENGINE
149+ DTRACE_INSTRUMENTED)
150
151=== modified file 'Percona-Server/storage/heap/CMakeLists.txt'
152--- Percona-Server/storage/heap/CMakeLists.txt 2013-05-10 09:39:17 +0000
153+++ Percona-Server/storage/heap/CMakeLists.txt 2013-07-08 14:19:34 +0000
154@@ -23,7 +23,8 @@
155 hp_dspace.c hp_record.c
156 hp_rrnd.c hp_rsame.c hp_scan.c hp_static.c hp_update.c hp_write.c)
157
158-MYSQL_ADD_PLUGIN(heap ${HEAP_SOURCES} STORAGE_ENGINE MANDATORY RECOMPILE_FOR_EMBEDDED)
159+MYSQL_ADD_PLUGIN(heap ${HEAP_SOURCES} STORAGE_ENGINE MANDATORY
160+ RECOMPILE_FOR_EMBEDDED DTRACE_INSTRUMENTED)
161
162 IF(WITH_UNIT_TESTS)
163 ADD_EXECUTABLE(hp_test1 hp_test1.c)
164
165=== modified file 'Percona-Server/storage/myisam/CMakeLists.txt'
166--- Percona-Server/storage/myisam/CMakeLists.txt 2012-08-22 01:40:20 +0000
167+++ Percona-Server/storage/myisam/CMakeLists.txt 2013-07-08 14:19:34 +0000
168@@ -30,7 +30,8 @@
169 MYSQL_ADD_PLUGIN(myisam ${MYISAM_SOURCES}
170 STORAGE_ENGINE
171 MANDATORY
172- RECOMPILE_FOR_EMBEDDED)
173+ RECOMPILE_FOR_EMBEDDED
174+ DTRACE_INSTRUMENTED)
175
176 TARGET_LINK_LIBRARIES(myisam mysys)
177
178
179=== modified file 'Percona-Server/storage/myisammrg/CMakeLists.txt'
180--- Percona-Server/storage/myisammrg/CMakeLists.txt 2011-09-07 10:08:09 +0000
181+++ Percona-Server/storage/myisammrg/CMakeLists.txt 2013-07-08 14:19:34 +0000
182@@ -20,4 +20,5 @@
183 myrg_rprev.c myrg_rrnd.c myrg_rsame.c myrg_static.c myrg_update.c
184 myrg_write.c myrg_records.c)
185
186-MYSQL_ADD_PLUGIN(myisammrg ${MYISAMMRG_SOURCES} STORAGE_ENGINE MANDATORY RECOMPILE_FOR_EMBEDDED)
187+MYSQL_ADD_PLUGIN(myisammrg ${MYISAMMRG_SOURCES} STORAGE_ENGINE MANDATORY
188+ RECOMPILE_FOR_EMBEDDED DTRACE_INSTRUMENTED)

Subscribers

People subscribed via source and target branches