Hi Mats,
Looks good.
Please find my review comments below.
STATUS
------
Approved.
REQUIRED CHANGES
----------------
RC1. Before pushing, please, re-enable rpl_plugin_load as well.
REQUESTS
--------
n/a
SUGGESTIONS
-----------
n/a
DETAILS
-------
n/a
On 09/03/2010 12:43 PM, Mats Kindahl wrote:
> #At file:///home/bzr/bugs/b55966-5.5-bugfixing/ based on
> revid:wlad@stripped
>
> 3203 Mats Kindahl 2010-09-03
> Bug #55966: "plugin" tests fail in 5.5
>
> On Solaris with version 3.4.6, the ha_example.so shared library is built
> with DTrace and the server is built without DTrace support. This occurs
> because dtrace.cmake disables DTrace support for 3.4.6, but still set
> HAVE_DTRACE, which causes probes_mysql.h to include probes_mysql_dtrace.h
> instead of probes_mysql_nodtrace.h.
>
> This patch fixes this by not setting HAVE_DTRACE on Solaris for GCC 3.4.6.
>
> modified:
> cmake/dtrace.cmake
> mysql-test/t/disabled.def
> === modified file 'cmake/dtrace.cmake'
> --- a/cmake/dtrace.cmake 2010-02-25 16:31:31 +0000
> +++ b/cmake/dtrace.cmake 2010-09-03 11:42:54 +0000
> @@ -13,13 +13,30 @@
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
>
> +IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX
> + AND CMAKE_SIZEOF_VOID_P EQUAL 4)
> + IF(NOT DEFINED BUGGY_GCC_NO_DTRACE_MODULES)
> + EXECUTE_PROCESS(
> + COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} --version
> + OUTPUT_VARIABLE out)
> + IF(out MATCHES "3.4.6")
> + # This gcc causes crashes in dlopen() for dtraced shared libs,
> + # while standard shipped with Solaris10 3.4.3 is ok
> + SET(BUGGY_GCC_NO_DTRACE_MODULES 1 CACHE INTERNAL "")
> + ELSE()
> + SET(BUGGY_GCC_NO_DTRACE_MODULES 0 CACHE INTERNAL "")
> + ENDIF()
> + ENDIF()
> +ENDIF()
> +
> # Check if OS supports DTrace
> MACRO(CHECK_DTRACE)
> FIND_PROGRAM(DTRACE dtrace)
> MARK_AS_ADVANCED(DTRACE)
>
> # On FreeBSD, dtrace does not handle userland tracing yet
> - IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
> + IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
> + AND NOT BUGGY_GCC_NO_DTRACE_MODULES)
> SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
> ENDIF()
> SET(HAVE_DTRACE ${ENABLE_DTRACE})
> @@ -72,22 +89,6 @@ IF(ENABLE_DTRACE)
> )
> ENDIF()
>
> -IF(CMAKE_SYSTEM_NAME MATCHES "SunOS" AND CMAKE_COMPILER_IS_GNUCXX
> - AND CMAKE_SIZEOF_VOID_P EQUAL 4)
> - IF(NOT DEFINED BUGGY_GCC_NO_DTRACE_MODULES)
> - EXECUTE_PROCESS(
> - COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} --version
> - OUTPUT_VARIABLE out)
> - IF(out MATCHES "3.4.6")
> - # This gcc causes crashes in dlopen() for dtraced shared libs,
> - # while standard shipped with Solaris10 3.4.3 is ok
> - SET(BUGGY_GCC_NO_DTRACE_MODULES 1 CACHE INTERNAL "")
> - ELSE()
> - SET(BUGGY_GCC_NO_DTRACE_MODULES 0 CACHE INTERNAL "")
> - ENDIF()
> - ENDIF()
> -ENDIF()
> -
> FUNCTION(DTRACE_INSTRUMENT target)
> IF(BUGGY_GCC_NO_DTRACE_MODULES)
> GET_TARGET_PROPERTY(target_type ${target} TYPE)
>
> === modified file 'mysql-test/t/disabled.def'
> --- a/mysql-test/t/disabled.def 2010-09-01 13:12:42 +0000
> +++ b/mysql-test/t/disabled.def 2010-09-03 11:42:54 +0000
> @@ -14,9 +14,9 @@ lowercase_table3 : Bug#54845 201
> mysqlhotcopy_myisam : Bug#54129 2010-08-31 alik mysqlhotcopy* fails
> mysqlhotcopy_archive : Bug#54129 2010-08-31 alik mysqlhotcopy* fails
> partition_innodb_plugin : Bug#53307 2010-04-30 VasilDimov valgrind warnings
> -plugin : Bug#55966 2010-08-13 alik "plugin" tests fail in 5.5
> -plugin_load : Bug#55966 2010-08-13 alik "plugin" tests fail in 5.5
> -plugin_not_embedded : Bug#55966 2010-08-13 alik "plugin" tests fail in 5.5
> +#plugin : Bug#55966 2010-08-13 alik "plugin" tests fail in 5.5
> +#plugin_load : Bug#55966 2010-08-13 alik "plugin" tests fail in 5.5
> +#plugin_not_embedded : Bug#55966 2010-08-13 alik "plugin" tests fail in 5.5
> query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails
> sporadically
> sp_sync : Bug#48157 2010-02-06 5.5-m3 demands a differnt solution
> ctype_utf8mb4_ndb : Bug#55799, Bug#51907, disabled by Konstantin 2010-08-06
>
>
>
>
>
