List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:March 29 2011 8:56am
Subject:Re: bzr commit into mysql-5.5 branch (daniel.fischer:3373) Bug#11769332
View as plain text  
2011/3/17 Daniel Fischer <daniel.fischer@stripped>

> #At file:///Users/df/bzr2/mysql-5.5-11769332/ based on
> revid:serge.kozlov@stripped
>
>  3373 Daniel Fischer    2011-03-17
>      Bug#11769332: Debug server can't load plugins on Windows.
>
>      Now it can. :)
>
>
Hi Daniel

I *think* i understand what you are doing, but not why.
Can you please add per-file comments.



>    modified:
>      cmake/install_macros.cmake
>      sql/CMakeLists.txt
> === modified file 'cmake/install_macros.cmake'
> --- a/cmake/install_macros.cmake        2010-11-13 22:16:52 +0000
> +++ b/cmake/install_macros.cmake        2011-03-17 12:41:52 +0000
> @@ -245,7 +245,7 @@ SET(DEBUGBUILDDIR "${BINARY_PARENTDIR}/d
>
>  FUNCTION(INSTALL_DEBUG_TARGET target)
>  MYSQL_PARSE_ARGUMENTS(ARG
> -  "DESTINATION;RENAME;PDB_DESTINATION;COMPONENT"
> +  "DESTINATION;RENAME;PDB_DESTINATION;COMPONENT;SUFFIX"
>   ""
>   ${ARGN}
>   )
> @@ -264,6 +264,11 @@ FUNCTION(INSTALL_DEBUG_TARGET target)
>   ELSE()
>    STRING(REPLACE "${CMAKE_CFG_INTDIR}" "Debug"  debug_target_location
> "${target_location}" )
>   ENDIF()
> +  IF(ARG_SUFFIX)
> +    GET_FILENAME_COMPONENT(ext ${debug_target_location} EXT)
> +    GET_FILENAME_COMPONENT(fn  ${debug_target_location} NAME_WE)
> +    STRING(REPLACE "${fn}${ext}" "${fn}${ARG_SUFFIX}${ext}"
>  debug_target_location "${debug_target_location}" )
>

Long line, please re-format.



> +  ENDIF()
>   IF(NOT ARG_COMPONENT)
>     SET(ARG_COMPONENT DebugBinaries)
>   ENDIF()
>
> === modified file 'sql/CMakeLists.txt'
> --- a/sql/CMakeLists.txt        2011-01-03 13:08:48 +0000
> +++ b/sql/CMakeLists.txt        2011-03-17 12:41:52 +0000
> @@ -100,6 +100,8 @@ ENDIF()
>
>  MYSQL_ADD_EXECUTABLE(mysqld ${MYSQLD_SOURCE} DESTINATION
> ${INSTALL_SBINDIR} COMPONENT Server)
>
> +SET_TARGET_PROPERTIES(mysqld PROPERTIES DEBUG_OUTPUT_NAME "mysqld-debug")
>

So now I have to run 'mtr --debug-server'  when testing a dbug build? (on
all platforms)

./mtr --force --mem --reorder --parallel=16
Logging: /export/home/didrik/repo/5.5/mysql-test/mysql-test-run.pl  --force
--mem --reorder --parallel=16
** ERROR: Could not find 'mysqld', 'mysqld-max-nt', 'mysqld-max', or
'mysqld-nt' in '/export/home/didrik/repo/5.5/bin-dbg/sql/mysqld',
............



> +
>  IF(NOT WITHOUT_DYNAMIC_PLUGINS)
>   SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE)
>   GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS)
> @@ -159,8 +161,9 @@ IF(WITH_MYSQLD_LDFLAGS)
>  ENDIF()
>  INSTALL_DEBUG_TARGET(mysqld
>   DESTINATION ${INSTALL_SBINDIR}
> -  PDB_DESTINATION ${INSTALL_SBINDIR}/debug
> -  RENAME mysqld-debug)
> +  PDB_DESTINATION ${INSTALL_SBINDIR}
> +  SUFFIX "-debug"
> +)
>
>  # Handle out-of-source build from source package with possibly broken
>  # bison. Copy bison output to from source to build directory, if not
> already
>
>
-- didrik



>
>
> --
> MySQL Code Commits Mailing List
> For list archives: http://lists.mysql.com/commits
> To unsubscribe:
> http://lists.mysql.com/commits?unsub=1
>

Thread
bzr commit into mysql-5.5 branch (daniel.fischer:3373) Bug#11769332Daniel Fischer17 Mar
Re: bzr commit into mysql-5.5 branch (daniel.fischer:3373) Bug#11769332Tor Didriksen29 Mar
  • RE: bzr commit into mysql-5.5 branch (daniel.fischer:3373) Bug#11769332Vladislav Vaintroub29 Mar
    • Re: bzr commit into mysql-5.5 branch (daniel.fischer:3373) Bug#11769332Tor Didriksen30 Mar