mysql-link.patch

   1 Workaround for: https://bugs.launchpad.net/percona-server/+bug/747152
   2
   3 When linking plugins which are linked to libraries already linked with
   4 probes_mysql.o, skip adding (second) probes_mysql.o .
   5
   6 --- Percona-Server-5.5.32-rel31.0/cmake/plugin.cmake.orig       2013-07-01 05:16:34.000000000 +0200
   7 +++ Percona-Server-5.5.32-rel31.0/cmake/plugin.cmake    2013-07-12 17:57:12.120001411 +0200
   8 @@ -47,7 +47,7 @@
   9  MACRO(MYSQL_ADD_PLUGIN)
  10    MYSQL_PARSE_ARGUMENTS(ARG
  11      "LINK_LIBRARIES;DEPENDENCIES;MODULE_OUTPUT_NAME;STATIC_OUTPUT_NAME"
  12 -    "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED"
  13 +    "STORAGE_ENGINE;STATIC_ONLY;MODULE_ONLY;MANDATORY;DEFAULT;DISABLED;RECOMPILE_FOR_EMBEDDED;SKIP_PROBES"
  14      ${ARGN}
  15    )
  16
  17 @@ -170,7 +170,9 @@
  18
  19      ADD_VERSION_INFO(${target} MODULE SOURCES)
  20      ADD_LIBRARY(${target} MODULE ${SOURCES})
  21 +    IF(NOT ARG_SKIP_PROBES)
  22      DTRACE_INSTRUMENT(${target})
  23 +    ENDIF()
  24      SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX ""
  25        COMPILE_DEFINITIONS "MYSQL_DYNAMIC_PLUGIN")
  26      TARGET_LINK_LIBRARIES (${target} mysqlservices)
  27 --- Percona-Server-5.5.32-rel31.0/storage/sphinx/CMakeLists.txt.orig    2012-11-05 12:48:48.000000000 +0100
  28 +++ Percona-Server-5.5.32-rel31.0/storage/sphinx/CMakeLists.txt 2013-07-12 17:57:36.740000378 +0200
  29 @@ -12,5 +12,5 @@
  30  ADD_LIBRARY(sphinx ha_sphinx.cc snippets_udf.cc)
  31  ELSE()
  32  SET(SPHINX_PLUGIN_DYNAMIC "ha_sphinx")
  33 -MYSQL_ADD_PLUGIN(sphinx ${SPHINX_SOURCES} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES mysys)
  34 +MYSQL_ADD_PLUGIN(sphinx ${SPHINX_SOURCES} STORAGE_ENGINE MODULE_ONLY SKIP_PROBES LINK_LIBRARIES mysys)
  35  ENDIF()
  36 --- Percona-Server-5.5.32-rel31.0/plugin/percona-pam-for-mysql/CMakeLists.txt.orig      2013-07-01 05:16:34.000000000 +0200
  37 +++ Percona-Server-5.5.32-rel31.0/plugin/percona-pam-for-mysql/CMakeLists.txt   2013-07-12 18:28:41.576588784 +0200
  38 @@ -31,6 +31,6 @@
  39    SET(AUTH_PAM_COMPAT_SOURCES ${AUTH_PAM_COMMON_SOURCES} src/auth_pam_compat.c)
  40    MYSQL_ADD_PLUGIN(auth_pam ${AUTH_PAM_SOURCES} LINK_LIBRARIES pam MODULE_ONLY)
  41    MYSQL_ADD_PLUGIN(auth_pam_compat ${AUTH_PAM_COMPAT_SOURCES} LINK_LIBRARIES pam MODULE_ONLY)
  42 -  MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES mysqlclient MODULE_ONLY)
  43 +  MYSQL_ADD_PLUGIN(dialog src/dialog.c LINK_LIBRARIES mysqlclient MODULE_ONLY SKIP_PROBES)
  44  ENDIF(HAVE_PAM AND HAVE_GETPWNAM_R AND HAVE_GETGRGID_R)
  45  ENDIF(WITH_PAM)