components/database/mariadb-106/patches/04-dtrace.patch

   1 --- mariadb-10.6.16/mysys_ssl/CMakeLists.txt.orig
   2 +++ mariadb-10.6.16/mysys_ssl/CMakeLists.txt
   3 @@ -46,4 +46,4 @@
   4
   5  ADD_CONVENIENCE_LIBRARY(mysys_ssl ${MYSYS_SSL_SOURCES})
   6  TARGET_LINK_LIBRARIES(mysys_ssl dbug strings ${SSL_LIBRARIES})
   7 -DTRACE_INSTRUMENT(mysys_ssl)
   8 +#DTRACE_INSTRUMENT(mysys_ssl)
   9 --- mariadb-10.6.16/cmake/plugin.cmake.orig
  10 +++ mariadb-10.6.16/cmake/plugin.cmake
  11 @@ -145,7 +145,7 @@
  12      ENDIF()
  13
  14      ADD_LIBRARY(${target} STATIC ${SOURCES})
  15 -    DTRACE_INSTRUMENT(${target})
  16 +    #DTRACE_INSTRUMENT(${target})
  17      ADD_DEPENDENCIES(${target} GenError ${ARG_DEPENDS})
  18      RESTRICT_SYMBOL_EXPORTS(${target})
  19      IF(WITH_EMBEDDED_SERVER AND (NOT ARG_NOT_EMBEDDED))
  20 @@ -155,7 +155,7 @@
  21          # Recompile some plugins for embedded
  22          ADD_CONVENIENCE_LIBRARY(${target}_embedded ${SOURCES})
  23          RESTRICT_SYMBOL_EXPORTS(${target}_embedded)
  24 -        DTRACE_INSTRUMENT(${target}_embedded)
  25 +        #DTRACE_INSTRUMENT(${target}_embedded)
  26          IF(ARG_RECOMPILE_FOR_EMBEDDED)
  27            SET_TARGET_PROPERTIES(${target}_embedded
  28              PROPERTIES COMPILE_DEFINITIONS "EMBEDDED_LIBRARY${version_string}")
  29 @@ -204,7 +204,7 @@
  30
  31      ADD_VERSION_INFO(${target} MODULE SOURCES)
  32      ADD_LIBRARY(${target} MODULE ${SOURCES})
  33 -    DTRACE_INSTRUMENT(${target})
  34 +    #DTRACE_INSTRUMENT(${target})
  35
  36      SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "")
  37      IF (NOT ARG_CLIENT)
  38 --- mariadb-10.6.16/storage/csv/CMakeLists.txt.orig
  39 +++ mariadb-10.6.16/storage/csv/CMakeLists.txt
  40 @@ -15,3 +15,10 @@
  41
  42  SET(CSV_SOURCES  ha_tina.cc ha_tina.h transparent_file.cc transparent_file.h)
  43  MYSQL_ADD_PLUGIN(csv ${CSV_SOURCES} STORAGE_ENGINE MANDATORY)
  44 +DTRACE_INSTRUMENT(csv)
  45 +IF(WITH_EMBEDDED_SERVER)
  46 +  IF(ARG_RECOMPILE_FOR_EMBEDDED OR NOT _SKIP_PIC)
  47 +    DTRACE_INSTRUMENT(csv_embedded)
  48 +  ENDIF()
  49 +ENDIF()
  50 +
  51 --- mariadb-10.6.16/extra/mariabackup/CMakeLists.txt.orig
  52 +++ mariadb-10.6.16/extra/mariabackup/CMakeLists.txt
  53 @@ -82,6 +82,8 @@
  54    TARGET_LINK_LIBRARIES(mariadb-backup pcre2-posix)
  55  ENDIF()
  56
  57 +DTRACE_INSTRUMENT(mariadb-backup)
  58 +
  59
  60  ########################################################################
  61  # mbstream binary
  62 --- mariadb-10.6.16/mysys/mf_keycache.c.orig
  63 +++ mariadb-10.6.16/mysys/mf_keycache.c
  64 @@ -3279,7 +3279,6 @@
  65      when a thread has got an exclusive lock for the key file.
  66  */
  67
  68 -static
  69  int simple_key_cache_write(SIMPLE_KEY_CACHE_CB *keycache,
  70                             File file, void *file_extra __attribute__((unused)),
  71                             my_off_t filepos, int level,