From: Vladislav Vaintroub Date: February 13 2010 4:36pm Subject: bzr commit into mysql-6.0-codebase branch (vvaintroub:3750) List-Archive: http://lists.mysql.com/commits/100253 Message-Id: <0KXS00DKHGTMM100@fe-emea-09.sun.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary_(ID_e3QCcFNBoDVGxNri+UiLkA)" --Boundary_(ID_e3QCcFNBoDVGxNri+UiLkA) MIME-version: 1.0 Content-type: text/plain; CHARSET=US-ASCII Content-transfer-encoding: 7BIT Content-disposition: inline #At file:///H:/bzr/mysql-6.0-codebase-cmake/ based on revid:vvaintroub@stripped 3750 Vladislav Vaintroub 2010-02-13 [merge] merge modified: sql/CMakeLists.txt === modified file 'sql/CMakeLists.txt' --- a/sql/CMakeLists.txt 2010-02-04 20:16:40 +0000 +++ b/sql/CMakeLists.txt 2010-02-13 16:35:18 +0000 @@ -13,11 +13,6 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -IF(MSVC) - #Innodb plugin needs linker-generated map file to locate server exports - #see bug#42001 - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS") -ENDIF(MSVC) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include --Boundary_(ID_e3QCcFNBoDVGxNri+UiLkA) MIME-version: 1.0 Content-type: text/bzr-bundle; CHARSET=US-ASCII; name="bzr/vvaintroub@stripped" Content-transfer-encoding: 7BIT Content-disposition: inline; filename="bzr/vvaintroub@stripped" # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: vvaintroub@stripped # target_branch: file:///H:/bzr/mysql-6.0-codebase-cmake/ # testament_sha1: 59884edf1ecde22d23a8e363bd66dbb631ed4044 # timestamp: 2010-02-13 17:36:50 +0100 # source_branch: file:///H:/bzr/mysql-6.0-codebase/ # base_revision_id: vvaintroub@stripped\ # sggdjtdjry2snuah # # Begin bundle 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 I9eTToir+HXznoaItjYJCD5//F3JFOFCQJBVSZQ= --Boundary_(ID_e3QCcFNBoDVGxNri+UiLkA)--