From: Bjorn Munch Date: August 17 2011 11:04am Subject: bzr push into mysql-trunk-mtr branch (bjorn.munch:3101 to 3102) Bug#11769332 List-Archive: http://lists.mysql.com/commits/140765 X-Bug: 11769332 Message-Id: <201108171104.p7HB4ndf014268@khepri15.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3102 Bjorn Munch 2011-08-17 Bug #11769332 PLUGIN TESTS FAIL ON WINDOWS WHEN USING DEBUG SERVER AND PLUGINS (DAILY-TRUNK) Modification to previous patch Build server as mysqld-debug in debug builds, but only if extra flag is used: cmake .... -DDEBUG_EXTNAME=ON Turn this on for BUILD_CONFIG=mysql_release Also removed disabling of tests for daily modified: cmake/build_configurations/mysql_release.cmake cmake/install_macros.cmake mysql-test/collections/disabled-daily.list sql/CMakeLists.txt 3101 Bjorn Munch 2011-08-12 [merge] null upmerge === modified file 'cmake/build_configurations/mysql_release.cmake' --- a/cmake/build_configurations/mysql_release.cmake 2011-07-04 12:27:08 +0000 +++ b/cmake/build_configurations/mysql_release.cmake 2011-08-17 09:22:05 +0000 @@ -96,6 +96,8 @@ OPTION(ENABLED_LOCAL_INFILE "" ON) SET(WITH_SSL bundled CACHE STRING "") SET(WITH_ZLIB bundled CACHE STRING "") +OPTION(DEBUG_EXTNAME "" ON) + IF(NOT COMPILATION_COMMENT) SET(COMPILATION_COMMENT "MySQL Community Server (GPL)") ENDIF() === modified file 'cmake/install_macros.cmake' --- a/cmake/install_macros.cmake 2011-06-30 15:50:45 +0000 +++ b/cmake/install_macros.cmake 2011-08-17 09:22:05 +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,12 @@ 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}" ) + ENDIF() IF(NOT ARG_COMPONENT) SET(ARG_COMPONENT DebugBinaries) ENDIF() === modified file 'mysql-test/collections/disabled-daily.list' --- a/mysql-test/collections/disabled-daily.list 2011-02-14 12:41:46 +0000 +++ b/mysql-test/collections/disabled-daily.list 2011-08-17 09:22:05 +0000 @@ -1,9 +0,0 @@ -rpl.rpl_semi_sync_event : lsoares 2011-02-11 BUG#11769332 Anitha asked me to disable this until plugin issues on windows are fixed. -rpl.rpl_semi_sync : lsoares 2011-02-11 BUG#11769332 Anitha asked me to disable this until plugin issues on windows are fixed. -sys_vars.rpl_semi_sync_master_enabled_basic : lsoares 2011-02-11 BUG#11769332 Anitha asked me to disable this until plugin issues on windows are fixed. -sys_vars.rpl_semi_sync_master_timeout_basic : lsoares 2011-02-11 BUG#11769332 Anitha asked me to disable this until plugin issues on windows are fixed. -sys_vars.rpl_semi_sync_master_trace_level_basic : lsoares 2011-02-11 BUG#11769332 Anitha asked me to disable this until plugin issues on windows are fixed. -sys_vars.rpl_semi_sync_master_wait_no_slave_basic : lsoares 2011-02-11 BUG#11769332 Anitha asked me to disable this until plugin issues on windows are fixed. -sys_vars.rpl_semi_sync_slave_enabled_basic : lsoares 2011-02-11 BUG#11769332 Anitha asked me to disable this until plugin issues on windows are fixed. -sys_vars.rpl_semi_sync_slave_trace_level_basic : lsoares 2011-02-11 BUG#11769332 Anitha asked me to disable this until plugin issues on windows are fixed. -sys_vars.all_vars : lsoares 2011-02-11 BUG#11769332 Anitha asked me to disable this until plugin issues on windows are fixed. === modified file 'sql/CMakeLists.txt' --- a/sql/CMakeLists.txt 2011-07-22 07:21:40 +0000 +++ b/sql/CMakeLists.txt 2011-08-17 09:22:05 +0000 @@ -219,6 +219,13 @@ ENDIF() MYSQL_ADD_EXECUTABLE(mysqld ${MYSQLD_SOURCE} DESTINATION ${INSTALL_SBINDIR} COMPONENT Server) +OPTION(DEBUG_EXTNAME "Build server as mysqld-debug (debug builds only)" OFF) +MARK_AS_ADVANCED(DEBUG_EXTNAME) + +IF(DEBUG_EXTNAME) + SET_TARGET_PROPERTIES(mysqld PROPERTIES DEBUG_OUTPUT_NAME "mysqld-debug") +ENDIF() + IF(NOT WITHOUT_DYNAMIC_PLUGINS) SET_TARGET_PROPERTIES(mysqld PROPERTIES ENABLE_EXPORTS TRUE) GET_TARGET_PROPERTY(mysqld_link_flags mysqld LINK_FLAGS) @@ -276,10 +283,17 @@ IF(WITH_MYSQLD_LDFLAGS) SET_TARGET_PROPERTIES(mysqld PROPERTIES LINK_FLAGS "${MYSQLD_LINK_FLAGS} ${WITH_MYSQLD_LDFLAGS}") ENDIF() -INSTALL_DEBUG_TARGET(mysqld - DESTINATION ${INSTALL_SBINDIR} - PDB_DESTINATION ${INSTALL_SBINDIR}/debug - RENAME mysqld-debug) +IF(DEBUG_EXTNAME) + INSTALL_DEBUG_TARGET(mysqld + DESTINATION ${INSTALL_SBINDIR} + PDB_DESTINATION ${INSTALL_SBINDIR} + SUFFIX "-debug") +ELSE() + INSTALL_DEBUG_TARGET(mysqld + DESTINATION ${INSTALL_SBINDIR} + PDB_DESTINATION ${INSTALL_SBINDIR}/debug + RENAME mysqld-debug) +ENDIF() # Handle out-of-source build from source package with possibly broken # bison. Copy bison output to from source to build directory, if not already No bundle (reason: useless for push emails).