Thu Feb 13 15:47:16 2014 UTC ()
Support building with recent DTrace (v1.11 or newer).
Patch from https://bugs.launchpad.net/percona-server/+bug/1196460
(jperkin)
diff -r1.30 -r1.31 pkgsrc/databases/mysql55-client/distinfo
diff -r1.4 -r1.5 pkgsrc/databases/mysql55-client/patches/patch-CMakeLists.txt
diff -r0 -r1.1 pkgsrc/databases/mysql55-client/patches/patch-cmake_dtrace.cmake
diff -r0 -r1.1 pkgsrc/databases/mysql55-client/patches/patch-cmake_plugin.cmake
diff -r0 -r1.1 pkgsrc/databases/mysql55-client/patches/patch-storage_archive_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/databases/mysql55-client/patches/patch-storage_blackhole_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/databases/mysql55-client/patches/patch-storage_csv_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/databases/mysql55-client/patches/patch-storage_example_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/databases/mysql55-client/patches/patch-storage_federated_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/databases/mysql55-client/patches/patch-storage_heap_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/databases/mysql55-client/patches/patch-storage_myisam_CMakeLists.txt
diff -r0 -r1.1 pkgsrc/databases/mysql55-client/patches/patch-storage_myisammrg_CMakeLists.txt
--- pkgsrc/databases/mysql55-client/Attic/distinfo 2014/02/01 11:16:03 1.30
+++ pkgsrc/databases/mysql55-client/Attic/distinfo 2014/02/13 15:47:15 1.31
| @@ -1,31 +1,41 @@ | | | @@ -1,31 +1,41 @@ |
1 | $NetBSD: distinfo,v 1.30 2014/02/01 11:16:03 adam Exp $ | | 1 | $NetBSD: distinfo,v 1.31 2014/02/13 15:47:15 jperkin Exp $ |
2 | | | 2 | |
3 | SHA1 (mysql-5.5.36.tar.gz) = 581d49e1a38d5536c8268350e2f91ed9d461909d | | 3 | SHA1 (mysql-5.5.36.tar.gz) = 581d49e1a38d5536c8268350e2f91ed9d461909d |
4 | RMD160 (mysql-5.5.36.tar.gz) = 7651338751545a30652836d9c7bb0d3102592180 | | 4 | RMD160 (mysql-5.5.36.tar.gz) = 7651338751545a30652836d9c7bb0d3102592180 |
5 | Size (mysql-5.5.36.tar.gz) = 21723910 bytes | | 5 | Size (mysql-5.5.36.tar.gz) = 21723910 bytes |
6 | SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 | | 6 | SHA1 (patch-BUILD_compile-pentium-gcov) = a1ac666efa953a98455a726e5db359c903d699b6 |
7 | SHA1 (patch-CMakeLists.txt) = 0c4263762d2d9fafd84b25038cae57a87fed339d | | 7 | SHA1 (patch-CMakeLists.txt) = 632e036cd9578d0636328c2259a8529c36f2d14a |
8 | SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf | | 8 | SHA1 (patch-client_completion_hash.cc) = e27fd7072a8206380f0a932b1a31d2843c985cbf |
9 | SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0 | | 9 | SHA1 (patch-client_mysqladmin.cc) = 382486c2f336eed87052e682b52d1acf444452a0 |
10 | SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206 | | 10 | SHA1 (patch-client_mysqlbinlog.cc) = e38abe026c10a07808ccd24b596cf13c5079e206 |
11 | SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600 | | 11 | SHA1 (patch-client_sql_string.cc) = 1547b8d3889af2831c89b97aecdbe8158711a600 |
| | | 12 | SHA1 (patch-cmake_dtrace.cmake) = 5ae3284589a17a8375b8a546136965fa337f3767 |
12 | SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09 | | 13 | SHA1 (patch-cmake_libutils.cmake) = 5d75a1762e3db6724bec2d75b45d40b17a5e9d09 |
| | | 14 | SHA1 (patch-cmake_plugin.cmake) = 2b702af6bf8f251886cea12cf7477abae7659230 |
13 | SHA1 (patch-cmake_readline.cmake) = aed279d6740e70d7e0e7565a6d9f0f214c866c8d | | 15 | SHA1 (patch-cmake_readline.cmake) = aed279d6740e70d7e0e7565a6d9f0f214c866c8d |
14 | SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847 | | 16 | SHA1 (patch-include_CMakeLists.txt) = 4781c69315624fb5567ae70cee87f1ddb3f89847 |
15 | SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 | | 17 | SHA1 (patch-include_my_compare.h) = f45bac4b488332a668b0005751856279b67401f5 |
16 | SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af | | 18 | SHA1 (patch-include_my_net.h) = 162c97a87ab00b407f6796b55ef839ba2e3ac2af |
17 | SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86 | | 19 | SHA1 (patch-include_my_pthread.h) = 109d376b4cf5b64c5243f9e91300667441131f86 |
18 | SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88 | | 20 | SHA1 (patch-include_myisam.h) = 475070d41b06c04c6ae692743fc1b0244afe0a88 |
19 | SHA1 (patch-libmysql_CMakeLists.txt) = 83deca6faca4116a088db87bf359524e3e6cd3ff | | 21 | SHA1 (patch-libmysql_CMakeLists.txt) = 83deca6faca4116a088db87bf359524e3e6cd3ff |
20 | SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892 | | 22 | SHA1 (patch-mysql-test_CMakeLists.txt) = d089a79df443ab2d8f97e7a1334aee2098dbb892 |
21 | SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3 | | 23 | SHA1 (patch-mysys_stacktrace.c) = 294b043984f740b99ba25abc8256ce8ad54d84c3 |
22 | SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59 | | 24 | SHA1 (patch-scripts_CMakeLists.txt) = 17ec1d8d5f0c9e453c64f2b59e757e645a3a1a59 |
23 | SHA1 (patch-scripts_mysqld_safe.sh) = cc34d8b4a8d4b34a6766a1123782ce3d0ad64478 | | 25 | SHA1 (patch-scripts_mysqld_safe.sh) = cc34d8b4a8d4b34a6766a1123782ce3d0ad64478 |
24 | SHA1 (patch-sql_CMakeLists.txt) = c4e72a0a93eb94a94501c267e2a43aedf8de2c76 | | 26 | SHA1 (patch-sql_CMakeLists.txt) = c4e72a0a93eb94a94501c267e2a43aedf8de2c76 |
25 | SHA1 (patch-sql_log_event.h) = 43a52ea2f410aa51b99f2f7e1f293a579e13f9c8 | | 27 | SHA1 (patch-sql_log_event.h) = 43a52ea2f410aa51b99f2f7e1f293a579e13f9c8 |
26 | SHA1 (patch-sql_mysqld.cc) = 7e2cfb58f6af8531920dd9128f7b3a35735d7d2c | | 28 | SHA1 (patch-sql_mysqld.cc) = 7e2cfb58f6af8531920dd9128f7b3a35735d7d2c |
27 | SHA1 (patch-sql_sql_string.h) = 32c0caf813f7ba94e9ed8fc6d0da4b4a52b41141 | | 29 | SHA1 (patch-sql_sql_string.h) = 32c0caf813f7ba94e9ed8fc6d0da4b4a52b41141 |
| | | 30 | SHA1 (patch-storage_archive_CMakeLists.txt) = 1144fc8dda537be12656e76c2a714f2af59d0368 |
| | | 31 | SHA1 (patch-storage_blackhole_CMakeLists.txt) = c8907f400c64e7405a2d112b80892fa0a395d212 |
| | | 32 | SHA1 (patch-storage_csv_CMakeLists.txt) = 59ef822fe0eeb65bd003a5cc6849b57d26276b56 |
| | | 33 | SHA1 (patch-storage_example_CMakeLists.txt) = 10b4e505dc2d7291b9f61228e34426f2f99479b5 |
| | | 34 | SHA1 (patch-storage_federated_CMakeLists.txt) = aec604eca871e9efcde479a31569127746884c92 |
| | | 35 | SHA1 (patch-storage_heap_CMakeLists.txt) = 997b3eabc62ab5fcd80b83d030b3f8de0a5bcdac |
28 | SHA1 (patch-storage_innobase_include_os0sync.h) = d3f66b063af3328f3ee518dd00dfc9d1d25943dc | | 36 | SHA1 (patch-storage_innobase_include_os0sync.h) = d3f66b063af3328f3ee518dd00dfc9d1d25943dc |
| | | 37 | SHA1 (patch-storage_myisam_CMakeLists.txt) = cad3fd135d30a9d3800a9bc525595ead92fc0a9c |
| | | 38 | SHA1 (patch-storage_myisammrg_CMakeLists.txt) = 7ec499b4c8a146c551fc129e86acf2a7ead8ca7b |
29 | SHA1 (patch-storage_ndb_include_util_Parser.hpp) = ca9406a8b01dffb3f515f132fa7aaef66c78f2be | | 39 | SHA1 (patch-storage_ndb_include_util_Parser.hpp) = ca9406a8b01dffb3f515f132fa7aaef66c78f2be |
30 | SHA1 (patch-strings_decimal.c) = dafedbfbd71149890f3356f3cafa77d6d0466f0f | | 40 | SHA1 (patch-strings_decimal.c) = dafedbfbd71149890f3356f3cafa77d6d0466f0f |
31 | SHA1 (patch-vio_viossl.c) = bc1922f1170ff55a6ed832b90c110e788b49d4be | | 41 | SHA1 (patch-vio_viossl.c) = bc1922f1170ff55a6ed832b90c110e788b49d4be |
--- pkgsrc/databases/mysql55-client/patches/Attic/patch-CMakeLists.txt 2013/04/20 08:06:56 1.4
+++ pkgsrc/databases/mysql55-client/patches/Attic/patch-CMakeLists.txt 2014/02/13 15:47:15 1.5
| @@ -1,19 +1,28 @@ | | | @@ -1,19 +1,28 @@ |
1 | $NetBSD: patch-CMakeLists.txt,v 1.4 2013/04/20 08:06:56 adam Exp $ | | 1 | $NetBSD: patch-CMakeLists.txt,v 1.5 2014/02/13 15:47:15 jperkin Exp $ |
2 | | | 2 | |
3 | Split configuration between mysql-client and mysql-server. | | 3 | Split configuration between mysql-client and mysql-server. |
| | | 4 | Build with newer DTrace. |
4 | | | 5 | |
5 | --- CMakeLists.txt.orig 2013-03-25 13:14:58.000000000 +0000 | | 6 | --- CMakeLists.txt.orig 2013-03-25 13:14:58.000000000 +0000 |
6 | +++ CMakeLists.txt | | 7 | +++ CMakeLists.txt |
| | | 8 | @@ -168,6 +168,7 @@ IF(DISABLE_SHARED) |
| | | 9 | SET(WITHOUT_DYNAMIC_PLUGINS 1) |
| | | 10 | ENDIF() |
| | | 11 | OPTION(ENABLED_PROFILING "Enable profiling" ON) |
| | | 12 | +OPTION(ENABLE_DTRACE "Include support for DTrace probes" OFF) |
| | | 13 | OPTION(CYBOZU "" OFF) |
| | | 14 | OPTION(BACKUP_TEST "" OFF) |
| | | 15 | OPTION(WITHOUT_SERVER OFF) |
7 | @@ -293,7 +293,6 @@ ADD_SUBDIRECTORY(strings) | | 16 | @@ -293,7 +293,6 @@ ADD_SUBDIRECTORY(strings) |
8 | ADD_SUBDIRECTORY(vio) | | 17 | ADD_SUBDIRECTORY(vio) |
9 | ADD_SUBDIRECTORY(regex) | | 18 | ADD_SUBDIRECTORY(regex) |
10 | ADD_SUBDIRECTORY(mysys) | | 19 | ADD_SUBDIRECTORY(mysys) |
11 | -ADD_SUBDIRECTORY(libmysql) | | 20 | -ADD_SUBDIRECTORY(libmysql) |
12 | | | 21 | |
13 | | | 22 | |
14 | IF(WITH_UNIT_TESTS) | | 23 | IF(WITH_UNIT_TESTS) |
15 | @@ -305,9 +304,13 @@ IF(WITH_UNIT_TESTS) | | 24 | @@ -305,9 +304,13 @@ IF(WITH_UNIT_TESTS) |
16 | ENDIF() | | 25 | ENDIF() |
17 | | | 26 | |
18 | ADD_SUBDIRECTORY(extra) | | 27 | ADD_SUBDIRECTORY(extra) |
19 | -IF(NOT WITHOUT_SERVER) | | 28 | -IF(NOT WITHOUT_SERVER) |
$NetBSD: patch-cmake_dtrace.cmake,v 1.1 2014/02/13 15:47:15 jperkin Exp $
Build with newer DTrace.
--- cmake/dtrace.cmake.orig 2014-01-14 08:16:26.000000000 +0000
+++ cmake/dtrace.cmake
@@ -35,10 +35,11 @@ MACRO(CHECK_DTRACE)
MARK_AS_ADVANCED(DTRACE)
# On FreeBSD, dtrace does not handle userland tracing yet
- IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
- AND NOT BUGGY_GCC_NO_DTRACE_MODULES)
- SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
+ IF(ENABLE_DTRACE AND (CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
+ OR BUGGY_GCC_NO_DTRACE_MODULES OR NOT DTRACE))
+ MESSAGE(FATAL_ERROR "dtrace is not supported on this system")
ENDIF()
+
SET(HAVE_DTRACE ${ENABLE_DTRACE})
IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
$NetBSD: patch-cmake_plugin.cmake,v 1.1 2014/02/13 15:47:15 jperkin Exp $
Build with newer DTrace.
--- cmake/plugin.cmake.orig 2014-01-14 08:16:26.000000000 +0000
+++ cmake/plugin.cmake
@@ -21,6 +21,7 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/cmake_
# [STORAGE_ENGINE]
# [MANDATORY|DEFAULT]
# [STATIC_ONLY|DYNAMIC_ONLY]
+# [DTRACE_INSTRUMENTED]
# [MODULE_OUTPUT_NAME module_name]
# [STATIC_OUTPUT_NAME static_name]
# [RECOMPILE_FOR_EMBEDDED]
@@ -47,7 +48,7 @@ ENDMACRO()
MACRO(MYSQL_ADD_PLUGIN)
MYSQL_PARSE_ARGUMENTS(ARG
"LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME"
- "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED"
+ "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED;DTRACE_INSTRUMENTED"
${ARGN}
)
@@ -116,7 +117,9 @@ MACRO(MYSQL_ADD_PLUGIN)
IF (WITH_${plugin} AND NOT ARG_MODULE_ONLY)
ADD_LIBRARY(${target} STATIC ${SOURCES})
SET_TARGET_PROPERTIES(${target} PROPERTIES COMPILE_DEFINITONS "MYSQL_SERVER")
- DTRACE_INSTRUMENT(${target})
+ IF (ARG_DTRACE_INSTRUMENTED)
+ DTRACE_INSTRUMENT(${target})
+ ENDIF()
ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
IF(WITH_EMBEDDED_SERVER)
# Embedded library should contain PIC code and be linkable
@@ -124,7 +127,9 @@ MACRO(MYSQL_ADD_PLUGIN)
IF(ARG_RECOMPILE_FOR_EMBEDDED OR NOT _SKIP_PIC)
# Recompile some plugins for embedded
ADD_CONVENIENCE_LIBRARY(${target}_embedded ${SOURCES})
- DTRACE_INSTRUMENT(${target}_embedded)
+ IF (ARG_DTRACE_INSTRUMENTED)
+ DTRACE_INSTRUMENT(${target}_embedded)
+ ENDIF()
IF(ARG_RECOMPILE_FOR_EMBEDDED)
SET_TARGET_PROPERTIES(${target}_embedded
PROPERTIES COMPILE_DEFINITIONS "MYSQL_SERVER;EMBEDDED_LIBRARY")
@@ -170,7 +175,9 @@ MACRO(MYSQL_ADD_PLUGIN)
ADD_VERSION_INFO(${target} MODULE SOURCES)
ADD_LIBRARY(${target} MODULE ${SOURCES})
- DTRACE_INSTRUMENT(${target})
+ IF (ARG_DTRACE_INSTRUMENTED)
+ DTRACE_INSTRUMENT(${target})
+ ENDIF()
SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX ""
COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
TARGET_LINK_LIBRARIES (${target} mysqlservices)
$NetBSD: patch-storage_archive_CMakeLists.txt,v 1.1 2014/02/13 15:47:15 jperkin Exp $
Build with newer DTrace.
--- storage/archive/CMakeLists.txt.orig 2014-01-14 08:16:26.000000000 +0000
+++ storage/archive/CMakeLists.txt
@@ -14,5 +14,6 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET(ARCHIVE_SOURCES azio.c ha_archive.cc ha_archive.h)
-MYSQL_ADD_PLUGIN(archive ${ARCHIVE_SOURCES} STORAGE_ENGINE LINK_LIBRARIES ${ZLIB_LIBRARY})
+MYSQL_ADD_PLUGIN(archive ${ARCHIVE_SOURCES} STORAGE_ENGINE
+ LINK_LIBRARIES ${ZLIB_LIBRARY} DTRACE_INSTRUMENTED)
$NetBSD: patch-storage_blackhole_CMakeLists.txt,v 1.1 2014/02/13 15:47:15 jperkin Exp $
Build with newer DTrace.
--- storage/blackhole/CMakeLists.txt.orig 2014-01-14 08:16:26.000000000 +0000
+++ storage/blackhole/CMakeLists.txt
@@ -14,4 +14,5 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SET(BLACKHOLE_SOURCES ha_blackhole.cc ha_blackhole.h)
-MYSQL_ADD_PLUGIN(blackhole ${BLACKHOLE_SOURCES} STORAGE_ENGINE)
+MYSQL_ADD_PLUGIN(blackhole ${BLACKHOLE_SOURCES} STORAGE_ENGINE
+ DTRACE_INSTRUMENTED)
$NetBSD: patch-storage_csv_CMakeLists.txt,v 1.1 2014/02/13 15:47:15 jperkin Exp $
Build with newer DTrace.
--- storage/csv/CMakeLists.txt.orig 2014-01-14 08:16:26.000000000 +0000
+++ storage/csv/CMakeLists.txt
@@ -17,4 +17,5 @@ SET(CSV_PLUGIN_STATIC "csv")
SET(CSV_PLUGIN_MANDATORY TRUE)
SET(CSV_SOURCES ha_tina.cc ha_tina.h transparent_file.cc transparent_file.h)
-MYSQL_ADD_PLUGIN(csv ${CSV_SOURCES} STORAGE_ENGINE MANDATORY)
+MYSQL_ADD_PLUGIN(csv ${CSV_SOURCES} STORAGE_ENGINE
+ MANDATORY DTRACE_INSTRUMENTED)
$NetBSD: patch-storage_example_CMakeLists.txt,v 1.1 2014/02/13 15:47:15 jperkin Exp $
Build with newer DTrace.
--- storage/example/CMakeLists.txt.orig 2014-01-14 08:16:26.000000000 +0000
+++ storage/example/CMakeLists.txt
@@ -15,4 +15,5 @@
SET(EXAMPLE_PLUGIN_DYNAMIC "ha_example")
SET(EXAMPLE_SOURCES ha_example.cc)
-MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE MODULE_ONLY)
+MYSQL_ADD_PLUGIN(example ${EXAMPLE_SOURCES} STORAGE_ENGINE MODULE_ONLY
+ DTRACE_INSTRUMENTED)
$NetBSD: patch-storage_federated_CMakeLists.txt,v 1.1 2014/02/13 15:47:15 jperkin Exp $
Build with newer DTrace.
--- storage/federated/CMakeLists.txt.orig 2014-01-14 08:16:26.000000000 +0000
+++ storage/federated/CMakeLists.txt
@@ -21,4 +21,5 @@ IF(NOT WITH_FEDERATED AND NOT WITH_FEDER
# mysqld and are optimized away by the linker.
SET(FEDERATED_SOURCES ${FEDERATED_SOURCES} ${CMAKE_SOURCE_DIR}/mysys/string.c)
ENDIF()
-MYSQL_ADD_PLUGIN(federated ${FEDERATED_SOURCES} STORAGE_ENGINE)
+MYSQL_ADD_PLUGIN(federated ${FEDERATED_SOURCES} STORAGE_ENGINE
+ DTRACE_INSTRUMENTED)
$NetBSD: patch-storage_heap_CMakeLists.txt,v 1.1 2014/02/13 15:47:15 jperkin Exp $
Build with newer DTrace.
--- storage/heap/CMakeLists.txt.orig 2014-01-14 08:16:26.000000000 +0000
+++ storage/heap/CMakeLists.txt
@@ -22,7 +22,8 @@ SET(HEAP_SOURCES _check.c _rectest.c hp
hp_rename.c hp_rfirst.c hp_rkey.c hp_rlast.c hp_rnext.c hp_rprev.c
hp_rrnd.c hp_rsame.c hp_scan.c hp_static.c hp_update.c hp_write.c)
-MYSQL_ADD_PLUGIN(heap ${HEAP_SOURCES} STORAGE_ENGINE MANDATORY RECOMPILE_FOR_EMBEDDED)
+MYSQL_ADD_PLUGIN(heap ${HEAP_SOURCES} STORAGE_ENGINE MANDATORY
+ RECOMPILE_FOR_EMBEDDED DTRACE_INSTRUMENTED)
ADD_EXECUTABLE(hp_test1 hp_test1.c)
TARGET_LINK_LIBRARIES(hp_test1 mysys heap dbug strings)
$NetBSD: patch-storage_myisam_CMakeLists.txt,v 1.1 2014/02/13 15:47:15 jperkin Exp $
Build with newer DTrace.
--- storage/myisam/CMakeLists.txt.orig 2014-01-14 08:16:26.000000000 +0000
+++ storage/myisam/CMakeLists.txt
@@ -29,7 +29,8 @@ SET(MYISAM_SOURCES ft_boolean_search.c
MYSQL_ADD_PLUGIN(myisam ${MYISAM_SOURCES}
STORAGE_ENGINE
MANDATORY
- RECOMPILE_FOR_EMBEDDED)
+ RECOMPILE_FOR_EMBEDDED
+ DTRACE_INSTRUMENTED)
TARGET_LINK_LIBRARIES(myisam mysys)
$NetBSD: patch-storage_myisammrg_CMakeLists.txt,v 1.1 2014/02/13 15:47:15 jperkin Exp $
Build with newer DTrace.
--- storage/myisammrg/CMakeLists.txt.orig 2014-01-14 08:16:26.000000000 +0000
+++ storage/myisammrg/CMakeLists.txt
@@ -20,4 +20,5 @@ SET(MYISAMMRG_SOURCES myrg_close.c myrg
myrg_rprev.c myrg_rrnd.c myrg_rsame.c myrg_static.c myrg_update.c
myrg_write.c myrg_records.c)
-MYSQL_ADD_PLUGIN(myisammrg ${MYISAMMRG_SOURCES} STORAGE_ENGINE MANDATORY RECOMPILE_FOR_EMBEDDED)
+MYSQL_ADD_PLUGIN(myisammrg ${MYISAMMRG_SOURCES} STORAGE_ENGINE MANDATORY
+ RECOMPILE_FOR_EMBEDDED DTRACE_INSTRUMENTED)