MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:kent Date:August 3 2007 7:51pm
Subject:bk commit into 5.0 tree (kent:1.2504) BUG#30118
View as plain text  
Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent 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@stripped, 2007-08-03 21:51:37+02:00, kent@stripped +14 -0
  CMakeLists.txt, README, configure.js
    Several adjustments to make client libraries pass the link test
    on both win32 and winx64, Visual Studio 2003 and 2005 (bug#30118)

  CMakeLists.txt@stripped, 2007-08-03 21:42:27+02:00, kent@stripped +2 -0

  CMakeLists.txt@stripped, 2007-08-03 15:20:30+02:00, kent@stripped +35 -59
    - Removed defines with no effect
    - Removed plugin handling, that is 5.1 only
    - Added EXAMPLE engine handling
    - Formatting changes, to make future reviewing of options easier

  dbug/CMakeLists.txt@stripped, 2007-08-03 21:45:26+02:00, kent@stripped +8 -3
    Changed to optionally be included to give a file list only

  extra/CMakeLists.txt@stripped, 2007-08-03 21:40:04+02:00, kent@stripped +4 -4
    Use the special 'debug' list element to mark that "dbug" library
    is only to be linked against if build type "Debug".

  extra/yassl/CMakeLists.txt@stripped, 2007-08-03 21:45:26+02:00, kent@stripped +9 -3
    Changed to optionally be included to give a file list only

  extra/yassl/taocrypt/CMakeLists.txt@stripped, 2007-08-03 21:45:26+02:00, kent@stripped +6 -2
    Changed to optionally be included to give a file list only

  libmysql/CMakeLists.txt@stripped, 2007-08-03 21:48:32+02:00, kent@stripped +42 -14
    For compatibility with Visual Studio 2005, list all files that are to
    be part of the library build, i.e. libraries can't be built from other
    libraries. Set SOURCE_SUBLIBS and include the file listings from
    "zlib", "dbug", "taocrypt" and "yassl"

  myisam/CMakeLists.txt@stripped, 2007-08-03 21:40:42+02:00, kent@stripped +4 -4
    Use the special 'debug' list element to mark that "dbug" library
    is only to be linked against if build type "Debug".

  mysys/CMakeLists.txt@stripped, 2007-08-03 21:43:43+02:00, kent@stripped +1 -1
    Restored include path to "mysys" itself

  mysys/CMakeLists.txt@stripped, 2007-08-03 15:22:40+02:00, kent@stripped +1 -2
    - Removed C++ flag changes, "mysys" lib is C only
    - No need to set current directory into include flags

  scripts/CMakeLists.txt@stripped, 2007-08-03 21:40:43+02:00, kent@stripped +1 -1
    Use the special 'debug' list element to mark that "dbug" library
    is only to be linked against if build type "Debug".

  server-tools/instance-manager/CMakeLists.txt@stripped, 2007-08-03 21:40:48+02:00, kent@stripped +1 -1
    Use the special 'debug' list element to mark that "dbug" library
    is only to be linked against if build type "Debug".

  sql/CMakeLists.txt@stripped, 2007-08-03 21:40:52+02:00, kent@stripped +1 -1
    Use the special 'debug' list element to mark that "dbug" library
    is only to be linked against if build type "Debug".

  win/README@stripped, 2007-08-03 15:23:23+02:00, kent@stripped +1 -2
    - Removed references to PARTITION engine, 5.1 only

  win/configure.js@stripped, 2007-08-03 15:23:35+02:00, kent@stripped +0 -1
    - Removed references to PARTITION engine, 5.1 only

  zlib/CMakeLists.txt@stripped, 2007-08-03 21:45:26+02:00, kent@stripped +6 -3
    Changed to optionally be included to give a file list only

diff -Nrup a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt	2007-07-25 19:18:10 +02:00
+++ b/CMakeLists.txt	2007-08-03 21:42:27 +02:00
@@ -22,53 +22,38 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/inclu
                ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)
 
 # Set standard options
-ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE)
 ADD_DEFINITIONS(-D CMAKE_BUILD)
 ADD_DEFINITIONS(-D HAVE_YASSL)
 
 # Set debug options
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS")
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DFORCE_INIT_OF_VARS")
-
-SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisam_plugin")
 
+# Note that some engines are always compiled in, MyISAM, MyISAMMRG, HEAP
 
 IF(WITH_ARCHIVE_STORAGE_ENGINE)
   ADD_DEFINITIONS(-D HAVE_ARCHIVE_DB)
 ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
 
-IF (WITH_HEAP_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D WITH_HEAP_STORAGE_ENGINE)
-  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_heap_plugin")
-ENDIF (WITH_HEAP_STORAGE_ENGINE)
-
-IF (WITH_MYISAMMRG_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D WITH_MYISAMMRG_STORAGE_ENGINE)
-  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisammrg_plugin")
-ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)
-
-IF(WITH_INNOBASE_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)
-  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)
-  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")
-ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
-
-IF(WITH_FEDERATED_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D HAVE_FEDERATED_DB)
-  ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)
-  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_federated_plugin")
-ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
-
 IF(WITH_BERKELEY_STORAGE_ENGINE)
   ADD_DEFINITIONS(-D HAVE_BERKELEY_DB)
-  ADD_DEFINITIONS(-D WITH_BERKELEY_STORAGE_ENGINE)
-  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_berkeley_plugin")
 ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
 
 IF (WITH_BLACKHOLE_STORAGE_ENGINE)
   ADD_DEFINITIONS(-D HAVE_BLACKHOLE_DB)
 ENDIF (WITH_BLACKHOLE_STORAGE_ENGINE)
 
+IF(WITH_EXAMPLE_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D HAVE_EXAMPLE_DB)
+ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
+
+IF(WITH_FEDERATED_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D HAVE_FEDERATED_DB)
+ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
+
+IF(WITH_INNOBASE_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)
+ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
+
 SET(localstatedir "C:\\mysql\\data")
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-huge.cnf.sh
                ${CMAKE_SOURCE_DIR}/support-files/my-huge.ini @ONLY)
@@ -102,37 +87,28 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual St
 
 IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
    CMAKE_GENERATOR MATCHES "Visual Studio 8")
-	# replace /MDd with /MTd
-	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG_INIT 
-	       ${CMAKE_CXX_FLAGS_DEBUG_INIT})
-	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG_INIT 
-	       ${CMAKE_C_FLAGS_DEBUG_INIT})
-	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE 
-	       ${CMAKE_C_FLAGS_RELEASE})
-	STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELWITHDEBINFO 
-	       ${CMAKE_C_FLAGS_RELWITHDEBINFO})
-	STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG 
-	       ${CMAKE_C_FLAGS_DEBUG})
-	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE 
-	       ${CMAKE_CXX_FLAGS_RELEASE})
-	STRING(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELWITHDEBINFO 
-	       ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
-	STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG 
-	       ${CMAKE_CXX_FLAGS_DEBUG})
-
-	# generate map files
-	SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
-
-  # set stack size (see bug#20815)
-  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1048576")
-
-	# remove support for Exception handling
-	STRING(REPLACE "/GX" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT 
-	       ${CMAKE_CXX_FLAGS_INIT})
-	STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT 
-	       ${CMAKE_CXX_FLAGS_DEBUG_INIT})
+
+    # replace /MDd with /MTd
+    STRING(REPLACE "/MD"  "/MT"  CMAKE_C_FLAGS_RELEASE          ${CMAKE_C_FLAGS_RELEASE})
+    STRING(REPLACE "/MD"  "/MT"  CMAKE_C_FLAGS_RELWITHDEBINFO   ${CMAKE_C_FLAGS_RELWITHDEBINFO})
+    STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG            ${CMAKE_C_FLAGS_DEBUG})
+    STRING(REPLACE "/MDd" "/MTd" CMAKE_C_FLAGS_DEBUG_INIT       ${CMAKE_C_FLAGS_DEBUG_INIT})
+
+    STRING(REPLACE "/MD"  "/MT"  CMAKE_CXX_FLAGS_RELEASE        ${CMAKE_CXX_FLAGS_RELEASE})
+    STRING(REPLACE "/MD"  "/MT"  CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
+    STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG          ${CMAKE_CXX_FLAGS_DEBUG})
+    STRING(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG_INIT     ${CMAKE_CXX_FLAGS_DEBUG_INIT})
+
+    # generate map files, set stack size (see bug#20815)
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MAP /MAPINFO:EXPORTS")
+    SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:1048576")
+
+    # remove support for Exception handling
+    STRING(REPLACE "/GX"   "" CMAKE_CXX_FLAGS            ${CMAKE_CXX_FLAGS})
+    STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS            ${CMAKE_CXX_FLAGS})
+    STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT       ${CMAKE_CXX_FLAGS_INIT})
+    STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT})
+
 ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR 
       CMAKE_GENERATOR MATCHES "Visual Studio 8")
 
@@ -196,6 +172,8 @@ IF(EMBED_MANIFESTS)
     ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64")
 ENDIF(EMBED_MANIFESTS)
 
+# FIXME "debug" only needed if build type is "Debug", but
+# CMAKE_BUILD_TYPE is not set during configure time.
 ADD_SUBDIRECTORY(vio)
 ADD_SUBDIRECTORY(dbug)
 ADD_SUBDIRECTORY(strings)
diff -Nrup a/dbug/CMakeLists.txt b/dbug/CMakeLists.txt
--- a/dbug/CMakeLists.txt	2007-08-02 12:39:18 +02:00
+++ b/dbug/CMakeLists.txt	2007-08-03 21:45:26 +02:00
@@ -13,7 +13,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/dbug)
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
-ADD_LIBRARY(dbug dbug.c factorial.c sanity.c)
+SET(DBUG_SOURCES dbug.c factorial.c sanity.c)
+
+IF(NOT SOURCE_SUBLIBS)
+  SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
+  INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+  ADD_LIBRARY(dbug ${DBUG_SOURCES})
+ENDIF(NOT SOURCE_SUBLIBS)
diff -Nrup a/extra/CMakeLists.txt b/extra/CMakeLists.txt
--- a/extra/CMakeLists.txt	2007-04-23 21:41:22 +02:00
+++ b/extra/CMakeLists.txt	2007-08-03 21:40:04 +02:00
@@ -20,7 +20,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
 
 ADD_EXECUTABLE(comp_err comp_err.c)
-TARGET_LINK_LIBRARIES(comp_err dbug mysys strings zlib wsock32)
+TARGET_LINK_LIBRARIES(comp_err debug dbug mysys strings zlib wsock32)
 
 GET_TARGET_PROPERTY(COMP_ERR_EXE comp_err LOCATION)
 
@@ -39,13 +39,13 @@ ADD_CUSTOM_TARGET(GenError
                   DEPENDS ${PROJECT_SOURCE_DIR}/include/mysqld_error.h)
 
 ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
-TARGET_LINK_LIBRARIES(my_print_defaults strings mysys dbug taocrypt wsock32)
+TARGET_LINK_LIBRARIES(my_print_defaults strings mysys debug dbug taocrypt wsock32)
 
 ADD_EXECUTABLE(perror perror.c)
-TARGET_LINK_LIBRARIES(perror strings mysys dbug wsock32)
+TARGET_LINK_LIBRARIES(perror strings mysys debug dbug wsock32)
 
 ADD_EXECUTABLE(replace replace.c)
-TARGET_LINK_LIBRARIES(replace strings mysys dbug wsock32)
+TARGET_LINK_LIBRARIES(replace strings mysys debug dbug wsock32)
 
 IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("my_print_defaults" "asInvoker")
diff -Nrup a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt
--- a/extra/yassl/CMakeLists.txt	2006-12-30 14:10:45 +01:00
+++ b/extra/yassl/CMakeLists.txt	2007-08-03 21:45:26 +02:00
@@ -13,9 +13,15 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-ADD_DEFINITIONS("-DWIN32 -D_LIB -DYASSL_PREFIX")
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extra/yassl/include
+                    ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include
+                    ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL)
 
-INCLUDE_DIRECTORIES(include taocrypt/include taocrypt/mySTL)
-ADD_LIBRARY(yassl src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp 
+ADD_DEFINITIONS("-D_LIB -DYASSL_PREFIX")
+
+SET(YASSL_SOURCES  src/buffer.cpp src/cert_wrapper.cpp src/crypto_wrapper.cpp src/handshake.cpp src/lock.cpp 
 				src/log.cpp src/socket_wrapper.cpp src/ssl.cpp src/timer.cpp src/yassl_error.cpp 
 				src/yassl_imp.cpp src/yassl_int.cpp)
+IF(NOT SOURCE_SUBLIBS)
+  ADD_LIBRARY(yassl ${YASSL_SOURCES})
+ENDIF(NOT SOURCE_SUBLIBS)
diff -Nrup a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt
--- a/extra/yassl/taocrypt/CMakeLists.txt	2006-12-30 14:10:45 +01:00
+++ b/extra/yassl/taocrypt/CMakeLists.txt	2007-08-03 21:45:26 +02:00
@@ -13,9 +13,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-INCLUDE_DIRECTORIES(mySTL include)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/mySTL
+                    ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include)
 
-ADD_LIBRARY(taocrypt src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp src/asn.cpp src/coding.cpp 
+SET(TAOCRYPT_SOURCES		src/aes.cpp src/aestables.cpp src/algebra.cpp src/arc4.cpp src/asn.cpp src/coding.cpp 
 				src/des.cpp src/dh.cpp src/dsa.cpp src/file.cpp src/hash.cpp src/integer.cpp src/md2.cpp 
 				src/md4.cpp src/md5.cpp src/misc.cpp src/random.cpp src/ripemd.cpp src/rsa.cpp src/sha.cpp
 				include/aes.hpp include/algebra.hpp include/arc4.hpp include/asn.hpp include/block.hpp 
@@ -23,3 +24,6 @@ ADD_LIBRARY(taocrypt src/aes.cpp src/aes
 				include/error.hpp include/file.hpp include/hash.hpp include/hmac.hpp include/integer.hpp 
 				include/md2.hpp include/md5.hpp include/misc.hpp include/modarith.hpp include/modes.hpp
 				include/random.hpp include/ripemd.hpp include/rsa.hpp include/sha.hpp)
+IF(NOT SOURCE_SUBLIBS)
+  ADD_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
+ENDIF(NOT SOURCE_SUBLIBS)
diff -Nrup a/libmysql/CMakeLists.txt b/libmysql/CMakeLists.txt
--- a/libmysql/CMakeLists.txt	2007-08-02 12:39:28 +02:00
+++ b/libmysql/CMakeLists.txt	2007-08-03 21:48:32 +02:00
@@ -24,13 +24,43 @@ SET(CMAKE_C_FLAGS_DEBUG   "${CMAKE_C_FLA
 # have been a problem anyway, they don't use thread local storage.
 
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include 
-                    ${CMAKE_SOURCE_DIR}/zlib 
-                    ${CMAKE_SOURCE_DIR}/extra/yassl/include 
                     ${CMAKE_SOURCE_DIR}/libmysql
                     ${CMAKE_SOURCE_DIR}/regex
                     ${CMAKE_SOURCE_DIR}/sql
                     ${CMAKE_SOURCE_DIR}/strings)
 
+# We include the source file listing instead of referencing the
+# libraries. At least with CMake 2.4 and Visual Studio 2005 a static
+# library created from other static libraries would not be complete,
+# i.e. the libraries listed in TARGET_LINK_LIBRARIES() were just
+# ignored.
+
+
+# Include and add the directory path
+SET(SOURCE_SUBLIBS TRUE)
+
+INCLUDE(${CMAKE_SOURCE_DIR}/zlib/CMakeLists.txt)
+FOREACH(rpath ${ZLIB_SOURCES})
+  SET(LIB_SOURCES ${LIB_SOURCES} ../zlib/${rpath})
+ENDFOREACH(rpath)
+
+# FIXME only needed if build type is "Debug", but CMAKE_BUILD_TYPE is
+# not set during configure time.
+INCLUDE(${CMAKE_SOURCE_DIR}/dbug/CMakeLists.txt)
+FOREACH(rpath ${DBUG_SOURCES})
+  SET(LIB_SOURCES ${LIB_SOURCES} ../dbug/${rpath})
+ENDFOREACH(rpath)
+
+INCLUDE(${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/CMakeLists.txt)
+FOREACH(rpath ${TAOCRYPT_SOURCES})
+  SET(LIB_SOURCES ${LIB_SOURCES} ../extra/yassl/taocrypt/${rpath})
+ENDFOREACH(rpath)
+
+INCLUDE(${CMAKE_SOURCE_DIR}/extra/yassl/CMakeLists.txt)
+FOREACH(rpath ${YASSL_SOURCES})
+  SET(LIB_SOURCES ${LIB_SOURCES} ../extra/yassl/${rpath})
+ENDFOREACH(rpath)
+
 SET(CLIENT_SOURCES   ../mysys/array.c ../strings/bchange.c ../strings/bmove.c 
                      ../strings/bmove_upp.c ../mysys/charset-def.c ../mysys/charset.c
                      ../sql-common/client.c ../strings/ctype-big5.c ../strings/ctype-bin.c 
@@ -66,7 +96,8 @@ SET(CLIENT_SOURCES   ../mysys/array.c ..
                      ../strings/strmov.c ../strings/strnlen.c ../strings/strnmov.c ../strings/strtod.c
                      ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c 
                      ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c 
-                     ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c)
+                     ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c
+		     ${LIB_SOURCES})
 
 # Need to set USE_TLS for building the DLL, since __declspec(thread)
 # approach to thread local storage does not work properly in DLLs.
@@ -79,23 +110,20 @@ SET(CLIENT_SOURCES   ../mysys/array.c ..
 # beond the documented API, and try access the Thread Local Storage.
 # The "_notls" means no Tls*() functions used, i.e. "static" TLS.
 
-ADD_LIBRARY(libmysql    SHARED dll.c libmysql.def ${CLIENT_SOURCES})
-ADD_LIBRARY(mysqlclient STATIC ${CLIENT_SOURCES})
+ADD_LIBRARY(libmysql          SHARED ${CLIENT_SOURCES} dll.c libmysql.def)
+ADD_LIBRARY(mysqlclient       STATIC ${CLIENT_SOURCES})
 ADD_LIBRARY(mysqlclient_notls STATIC ${CLIENT_SOURCES})
 
 SET_TARGET_PROPERTIES(libmysql mysqlclient PROPERTIES COMPILE_FLAGS "-DUSE_TLS")
 
-SET(CLIENT_LIB_DEPS yassl taocrypt zlib dbug GenError)
-SET(CLIENT_LIBS     yassl taocrypt zlib debug dbug)
-
-ADD_DEPENDENCIES(libmysql ${CLIENT_LIB_DEPS})
-TARGET_LINK_LIBRARIES(libmysql ${CLIENT_LIBS} wsock32)
+ADD_DEPENDENCIES(libmysql GenError)
+TARGET_LINK_LIBRARIES(libmysql wsock32)
 
-ADD_DEPENDENCIES(mysqlclient ${CLIENT_LIB_DEPS})
-TARGET_LINK_LIBRARIES(mysqlclient ${CLIENT_LIBS})
+ADD_DEPENDENCIES(mysqlclient GenError)
+TARGET_LINK_LIBRARIES(mysqlclient)
 
-ADD_DEPENDENCIES(mysqlclient_notls ${CLIENT_LIB_DEPS})
-TARGET_LINK_LIBRARIES(mysqlclient_notls ${CLIENT_LIBS})
+ADD_DEPENDENCIES(mysqlclient_notls GenError)
+TARGET_LINK_LIBRARIES(mysqlclient_notls)
 
 ADD_EXECUTABLE(myTest mytest.c)
 TARGET_LINK_LIBRARIES(myTest libmysql)
diff -Nrup a/myisam/CMakeLists.txt b/myisam/CMakeLists.txt
--- a/myisam/CMakeLists.txt	2007-04-23 21:41:22 +02:00
+++ b/myisam/CMakeLists.txt	2007-08-03 21:40:42 +02:00
@@ -30,16 +30,16 @@ ADD_LIBRARY(myisam ft_boolean_search.c f
 				rt_split.c sort.c sp_key.c ft_eval.h myisamdef.h rt_index.h mi_rkey.c)
 
 ADD_EXECUTABLE(myisam_ftdump myisam_ftdump.c)
-TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(myisam_ftdump myisam mysys debug dbug strings zlib wsock32)
 
 ADD_EXECUTABLE(myisamchk myisamchk.c)
-TARGET_LINK_LIBRARIES(myisamchk myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(myisamchk myisam mysys debug dbug strings zlib wsock32)
 
 ADD_EXECUTABLE(myisamlog myisamlog.c)
-TARGET_LINK_LIBRARIES(myisamlog myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(myisamlog myisam mysys debug dbug strings zlib wsock32)
 
 ADD_EXECUTABLE(myisampack myisampack.c)
-TARGET_LINK_LIBRARIES(myisampack myisam mysys dbug strings zlib wsock32)
+TARGET_LINK_LIBRARIES(myisampack myisam mysys debug dbug strings zlib wsock32)
 
 IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("myisam_ftdump" "asInvoker")
diff -Nrup a/mysys/CMakeLists.txt b/mysys/CMakeLists.txt
--- a/mysys/CMakeLists.txt	2007-08-02 12:39:39 +02:00
+++ b/mysys/CMakeLists.txt	2007-08-03 21:43:43 +02:00
@@ -13,7 +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
 
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 
 # Only the server link with this library, the client libraries and the client
@@ -21,7 +20,7 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS
 # So we only need to create one version of this library, with the "static"
 # Thread Local Storage model.
 
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys )
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/mysys)
 
 ADD_LIBRARY(mysys array.c charset-def.c charset.c checksum.c default.c default_modify.c
 				errors.c hash.c list.c md5.c mf_brkhant.c mf_cache.c mf_dirname.c mf_fn_ext.c
diff -Nrup a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
--- a/scripts/CMakeLists.txt	2007-05-02 18:41:34 +02:00
+++ b/scripts/CMakeLists.txt	2007-08-03 21:40:43 +02:00
@@ -24,7 +24,7 @@ ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_SOUR
 
 # Build comp_sql - used for embedding SQL in C or C++ programs
 ADD_EXECUTABLE(comp_sql comp_sql.c)
-TARGET_LINK_LIBRARIES(comp_sql dbug mysys strings)
+TARGET_LINK_LIBRARIES(comp_sql debug dbug mysys strings)
 
 # Use comp_sql to build mysql_fix_privilege_tables_sql.c
 GET_TARGET_PROPERTY(COMP_SQL_EXE comp_sql LOCATION)
diff -Nrup a/server-tools/instance-manager/CMakeLists.txt b/server-tools/instance-manager/CMakeLists.txt
--- a/server-tools/instance-manager/CMakeLists.txt	2007-04-23 21:41:22 +02:00
+++ b/server-tools/instance-manager/CMakeLists.txt	2007-08-03 21:40:48 +02:00
@@ -30,7 +30,7 @@ ADD_EXECUTABLE(mysqlmanager buffer.cc co
                             ../../libmysql/errmsg.c)
 
 ADD_DEPENDENCIES(mysqlmanager GenError)
-TARGET_LINK_LIBRARIES(mysqlmanager dbug mysys strings taocrypt vio yassl zlib wsock32)
+TARGET_LINK_LIBRARIES(mysqlmanager debug dbug mysys strings taocrypt vio yassl zlib wsock32)
 
 IF(EMBED_MANIFESTS)
   MYSQL_EMBED_MANIFEST("mysqlmanager" "asInvoker")
diff -Nrup a/sql/CMakeLists.txt b/sql/CMakeLists.txt
--- a/sql/CMakeLists.txt	2007-08-02 21:49:36 +02:00
+++ b/sql/CMakeLists.txt	2007-08-03 21:40:52 +02:00
@@ -84,7 +84,7 @@ ADD_EXECUTABLE(mysqld${MYSQLD_EXE_SUFFIX
 			   ${PROJECT_SOURCE_DIR}/sql/lex_hash.h)
 
 TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX}
-		      heap myisam myisammrg mysys yassl zlib dbug yassl 
+		      heap myisam myisammrg mysys yassl zlib debug dbug yassl 
                       taocrypt strings vio regex wsock32)
 
 IF(EMBED_MANIFESTS)
diff -Nrup a/win/README b/win/README
--- a/win/README	2007-07-25 19:18:10 +02:00
+++ b/win/README	2007-08-03 15:23:23 +02:00
@@ -37,7 +37,6 @@ From the root of your bk clone, execute 
 The options right now are
 
     WITH_INNOBASE_STORAGE_ENGINE         Enable particular storage engines
-    WITH_PARTITION_STORAGE_ENGINE
     WITH_ARCHIVE_STORAGE_ENGINE
     WITH_BERKELEY_STORAGE_ENGINE
     WITH_BLACKHOLE_STORAGE_ENGINE
@@ -57,7 +56,7 @@ The options right now are
 
 So the command line could look like:
 
-win\configure WITH_INNOBASE_STORAGE_ENGINE WITH_PARTITION_STORAGE_ENGINE MYSQL_SERVER_SUFFIX=-pro
+win\configure WITH_INNOBASE_STORAGE_ENGINE WITH_ARCHIVE_STORAGE_ENGINE MYSQL_SERVER_SUFFIX=-my-suffix
 
 Step 5
 ------
diff -Nrup a/win/configure.js b/win/configure.js
--- a/win/configure.js	2007-07-18 15:42:09 +02:00
+++ b/win/configure.js	2007-08-03 15:23:35 +02:00
@@ -44,7 +44,6 @@ try 
             case "WITH_EXAMPLE_STORAGE_ENGINE":
             case "WITH_FEDERATED_STORAGE_ENGINE":
             case "WITH_INNOBASE_STORAGE_ENGINE":
-            case "WITH_PARTITION_STORAGE_ENGINE":
             case "__NT__":
             case "DISABLE_GRANT_OPTIONS":
             case "EMBED_MANIFESTS":
diff -Nrup a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
--- a/zlib/CMakeLists.txt	2007-08-02 12:40:37 +02:00
+++ b/zlib/CMakeLists.txt	2007-08-03 21:45:26 +02:00
@@ -18,10 +18,13 @@
 # Not directly and indirectly using any of the macros for creating and
 # using the storage, pthread_key*(), {,my_}{set,get}_specific*() ....
 
-SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib)
+
 SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")
 
-ADD_LIBRARY(zlib adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.c infback.c inffast.c inffast.h
+SET(ZLIB_SOURCES  adler32.c compress.c crc32.c crc32.h deflate.c deflate.h gzio.c infback.c inffast.c inffast.h
 			inffixed.h inflate.c inflate.h inftrees.c inftrees.h trees.c trees.h uncompr.c zconf.h zlib.h
 			zutil.c zutil.h)
-			
\ No newline at end of file
+IF(NOT SOURCE_SUBLIBS)
+  ADD_LIBRARY(zlib ${ZLIB_SOURCES})
+ENDIF(NOT SOURCE_SUBLIBS)
Thread
bk commit into 5.0 tree (kent:1.2504) BUG#30118kent3 Aug