bk commit into 5.1 tree (iggy:1.2599) BUG#31217

From: Ignacio Galarza <iggy(at)mysql.com>
Date: Wed Oct 31 2007 - 17:17:37 EDT

Below is the list of changes that have just been committed into a local 5.1 repository of iggy. When iggy does a push these changes will be propagated to the main repository and, within 24 hours after the push, to the public repository.
For information on how to access the public repository see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@1.2599, 2007-10-31 17:17:27-04:00, iggy@amd64.(none) +1 -0   Bug#31217 C1033 compilation error on Windows

• This workaround is no longer necessary with cmake 2.4.7.

  sql/CMakeLists.txt@1.20, 2007-10-31 17:17:24-04:00, iggy@amd64.(none) +0 -7     Bug#31217 C1033 compilation error on Windows

• Remove workaround no longer needed.

diff -Nrup a/sql/CMakeLists.txt b/sql/CMakeLists.txt
--- a/sql/CMakeLists.txt 2007-09-04 05:06:56 -04:00
+++ b/sql/CMakeLists.txt 2007-10-31 17:17:24 -04:00 @@ -90,13 +90,6 @@ TARGET_LINK_LIBRARIES(mysqld  

 SET_TARGET_PROPERTIES(mysqld PROPERTIES OUTPUT_NAME mysqld${MYSQLD_EXE_SUFFIX})  

-# Work around for 2.4.6 bug, OUTPUT_NAME will not set the right .PDB
-# file name. Note that COMPILE_FLAGS set some temporary pdb during build,
-# LINK_FLAGS sets the real one.
-SET_TARGET_PROPERTIES(mysqld PROPERTIES

• COMPILE_FLAGS "/Fd${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb"
• LINK_FLAGS "/PDB:${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb")
  -
  IF(EMBED_MANIFESTS) MYSQL_EMBED_MANIFEST("mysqld" "asInvoker") ENDIF(EMBED_MANIFESTS)

--

MySQL Code Commits Mailing List
For list archives: http://lists.mysql.com/commits To unsubscribe: http://lists.mysql.com/commits?unsub=lists@pantek.com Received on Wed Oct 31 17:18:48 2007