Advertisement
Guest User

Untitled

a guest
Nov 11th, 2013
105
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.64 KB | None | 0 0
  1. diff -ru mariadb-5.5.32.orig/cmake/plugin.cmake mariadb-5.5.32/cmake/plugin.cmake
  2. --- mariadb-5.5.32.orig/cmake/plugin.cmake 2013-07-17 18:51:28.000000000 +0400
  3. +++ mariadb-5.5.32/cmake/plugin.cmake 2013-11-11 13:37:44.978143666 +0400
  4. @@ -134,7 +134,7 @@
  5. ENDIF()
  6.  
  7. ADD_LIBRARY(${target} STATIC ${SOURCES})
  8. - DTRACE_INSTRUMENT(${target})
  9. +# DTRACE_INSTRUMENT(${target})
  10. ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDENCIES})
  11. RESTRICT_SYMBOL_EXPORTS(${target})
  12. IF(WITH_EMBEDDED_SERVER)
  13. @@ -143,7 +143,7 @@
  14. IF(ARG_RECOMPILE_FOR_EMBEDDED OR NOT _SKIP_PIC)
  15. # Recompile some plugins for embedded
  16. ADD_CONVENIENCE_LIBRARY(${target}_embedded ${SOURCES})
  17. - DTRACE_INSTRUMENT(${target}_embedded)
  18. +# DTRACE_INSTRUMENT(${target}_embedded)
  19. IF(ARG_RECOMPILE_FOR_EMBEDDED)
  20. SET_TARGET_PROPERTIES(${target}_embedded
  21. PROPERTIES COMPILE_DEFINITIONS "EMBEDDED_LIBRARY")
  22. @@ -182,7 +182,7 @@
  23.  
  24. ADD_VERSION_INFO(${target} MODULE SOURCES)
  25. ADD_LIBRARY(${target} MODULE ${SOURCES})
  26. - DTRACE_INSTRUMENT(${target})
  27. +# DTRACE_INSTRUMENT(${target})
  28. SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX ""
  29. COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
  30. TARGET_LINK_LIBRARIES (${target} mysqlservices)
  31. --- mariadb-5.5.32.orig/sql/CMakeLists.txt 2013-07-17 18:51:28.000000000 +0400
  32. +++ mariadb-5.5.32/sql/CMakeLists.txt 2013-11-11 16:23:16.414591695 +0400
  33. @@ -97,10 +97,22 @@
  34.  
  35. MYSQL_ADD_PLUGIN(partition ha_partition.cc STORAGE_ENGINE DEFAULT STATIC_ONLY
  36. RECOMPILE_FOR_EMBEDDED)
  37. +DTRACE_INSTRUMENT(partition)
  38. +IF(WITH_EMBEDDED_SERVER)
  39. + IF(ARG_RECOMPILE_FOR_EMBEDDED OR NOT _SKIP_PIC)
  40. + DTRACE_INSTRUMENT(partition_embedded)
  41. + ENDIF()
  42. +ENDIF()
  43.  
  44. ADD_LIBRARY(sql STATIC ${SQL_SOURCE})
  45. ADD_DEPENDENCIES(sql GenServerSource)
  46. DTRACE_INSTRUMENT(sql)
  47. +IF(WITH_EMBEDDED_SERVER)
  48. + IF(ARG_RECOMPILE_FOR_EMBEDDED OR NOT _SKIP_PIC)
  49. + DTRACE_INSTRUMENT(sql_embedded)
  50. + ENDIF()
  51. +ENDIF()
  52. +
  53. TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS}
  54. mysys dbug strings vio regex
  55. ${LIBWRAP} ${LIBCRYPT} ${LIBDL}
  56. --- mariadb-5.5.32.orig/storage/csv/CMakeLists.txt 2013-07-17 18:51:28.000000000 +0400
  57. +++ mariadb-5.5.32/storage/csv/CMakeLists.txt 2013-11-11 16:21:54.747257748 +0400
  58. @@ -15,3 +15,9 @@
  59.  
  60. SET(CSV_SOURCES ha_tina.cc ha_tina.h transparent_file.cc transparent_file.h)
  61. MYSQL_ADD_PLUGIN(csv ${CSV_SOURCES} STORAGE_ENGINE MANDATORY)
  62. +DTRACE_INSTRUMENT(csv)
  63. +IF(WITH_EMBEDDED_SERVER)
  64. + IF(ARG_RECOMPILE_FOR_EMBEDDED OR NOT _SKIP_PIC)
  65. + DTRACE_INSTRUMENT(csv_embedded)
  66. + ENDIF()
  67. +ENDIF()
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement