bk commit into 5.1 tree (georg:1.2320)

[georg]

Below is the list of changes that have just been committed into a local
5.1 repository of georg. When georg 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, 2006-09-17 22:27:59+02:00, georg@stripped +3 -0
  minor fixes for VS 7.1 build

  libmysqld/CMakeLists.txt@stripped, 2006-09-17 22:27:54+02:00, georg@stripped +7 -5
    added missing target libraries

  sql/CMakeLists.txt@stripped, 2006-09-17 22:27:54+02:00, georg@stripped +8 -12
    moved generation of lex_hash.h to CmakeBase.include

  win/CMakeBase.include@stripped, 2006-09-17 22:27:55+02:00, georg@stripped +8 -2
    moved generation of lex_hash.h to CmakeBase.include

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.1-win

--- 1.3/win/CMakeBase.include	2006-09-17 22:28:11 +02:00
+++ 1.4/win/CMakeBase.include	2006-09-17 22:28:11 +02:00
@@ -16,7 +16,7 @@
 ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE)
 SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisam_plugin")
 SET(mysql_se_ha_src "${mysql_se_ha_src} ../storage/myisam/ha_myisam.cc")
-SET(mysql_se_libs "myisam csv heap myisammrg")
+SET(mysql_se_libs "csv heap myisam myisammrg")
 
 SET(WITH_MYISAMMRG_STORAGE_ENGINE TRUE)
 ADD_DEFINITIONS(-D WITH_MYISAMMRG_STORAGE_ENGINE)
@@ -85,4 +85,10 @@
 	DEPENDS ${PROJECT_SOURCE_DIR}/sql/message.mc
 )
 
-
+# Lex.h
+GET_TARGET_PROPERTY(GEN_LEX_HASH_EXE gen_lex_hash LOCATION)
+ADD_CUSTOM_COMMAND(
+	OUTPUT ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
+	COMMAND ${GEN_LEX_HASH_EXE} ARGS > ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
+	DEPENDS ${GEN_LEX_HASH_EXE}
+)

--- 1.12/libmysqld/CMakeLists.txt	2006-09-17 22:28:11 +02:00
+++ 1.13/libmysqld/CMakeLists.txt	2006-09-17 22:28:11 +02:00
@@ -73,8 +73,8 @@
             ../sql/partition_info.cc ../sql/sql_locale.cc
             ../vio/vio.c ../vio/viosocket.c ../vio/viossl.c
             ../vio/viosslfactories.c .
-			${PROJECT_SOURCE_DIR}/sql/message.h
-			${PROJECT_SOURCE_DIR}/sql/lex_hash.h
+            ${PROJECT_SOURCE_DIR}/sql/message.h
+            ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
             ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
             ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h)
 
@@ -84,9 +84,11 @@
 FILE(WRITE cmake_dummy.c " ")
 
 ADD_LIBRARY(mysqlserver cmake_dummy.c)
-ADD_DEPENDENCIES(mysqlserver dbug mysys strings zlib mysqldemb regex myisam myisammrg
-                 ${mysql_se_libs} heap yassl taocrypt)
-TARGET_LINK_LIBRARIES(mysqlserver ${mysql_se_libs} wsock32)
+TARGET_LINK_LIBRARIES(mysqlserver wsock32)
+ADD_DEPENDENCIES(mysqlserver dbug mysys strings zlib mysqldemb regex 
+                 ${mysql_se_libs} yassl taocrypt)
+TARGET_LINK_LIBRARIES(mysqlserver dbug mysys strings zlib mysqldemb regex 
+                 ${mysql_se_libs} yassl taocrypt)
 
 ADD_LIBRARY(libmysqld MODULE cmake_dummy.c libmysqld.def)
 ADD_DEPENDENCIES(libmysqld mysqlserver)

--- 1.35/sql/CMakeLists.txt	2006-09-17 22:28:11 +02:00
+++ 1.36/sql/CMakeLists.txt	2006-09-17 22:28:11 +02:00
@@ -1,3 +1,7 @@
+# Gen_lex_hash
+ADD_EXECUTABLE(gen_lex_hash ${PROJECT_SOURCE_DIR}/sql/gen_lex_hash.cc)
+TARGET_LINK_LIBRARIES(gen_lex_hash dbug mysqlclient wsock32)
+
 INCLUDE(../win/CMakeBase.include)
 
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in 
@@ -30,15 +34,6 @@
 ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER 
                 -D_CONSOLE -DHAVE_DLOPEN)
 
-# Gen_lex_hash
-ADD_EXECUTABLE(gen_lex_hash ${PROJECT_SOURCE_DIR}/sql/gen_lex_hash.cc)
-TARGET_LINK_LIBRARIES(gen_lex_hash dbug mysqlclient wsock32)
-GET_TARGET_PROPERTY(GEN_LEX_HASH_EXE gen_lex_hash LOCATION)
-ADD_CUSTOM_COMMAND(
-	OUTPUT ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
-	COMMAND ${GEN_LEX_HASH_EXE} ARGS > ${PROJECT_SOURCE_DIR}/sql/lex_hash.h
-	DEPENDS ${GEN_LEX_HASH_EXE}
-)
 
 ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc
                discover.cc ../libmysql/errmsg.c field.cc field_conv.cc 
@@ -76,9 +71,10 @@
 			   ${PROJECT_SOURCE_DIR}/include/mysql_version.h 
 			   ${PROJECT_SOURCE_DIR}/sql/sql_builtin.cc
 			   ${PROJECT_SOURCE_DIR}/sql/lex_hash.h)
-TARGET_LINK_LIBRARIES(mysqld ${mysql_se_libs} mysys yassl zlib dbug yassl 
-                      taocrypt strings vio regex wsock32 )
+ADD_DEPENDENCIES(mysqld gen_lex_hash)
+TARGET_LINK_LIBRARIES(mysqld yassl mysys yassl zlib
+                      ${mysql_se_libs} 
+                      dbug taocrypt strings vio regex wsock32 )
 
 ADD_DEPENDENCIES(mysqld GenError)
 
-ADD_DEPENDENCIES(mysqld gen_lex_hash)