bk commit into 5.0 tree (kent:1.2532)

[kent]

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-07-18 15:42:36+02:00, kent@stripped +2 -0
  CMakeLists.txt, configure.js:
    Allow to set mysqld exe suffix

  sql/CMakeLists.txt@stripped, 2007-07-18 15:42:09+02:00, kent@stripped +9 -7
    Allow to set mysqld exe suffix

  win/configure.js@stripped, 2007-07-18 15:42:09+02:00, kent@stripped +1 -0
    Allow to set mysqld exe suffix

diff -Nrup a/sql/CMakeLists.txt b/sql/CMakeLists.txt
--- a/sql/CMakeLists.txt	2007-05-15 16:30:09 +02:00
+++ b/sql/CMakeLists.txt	2007-07-18 15:42:09 +02:00
@@ -46,7 +46,8 @@ IF(DISABLE_GRANT_OPTIONS)               
   ADD_DEFINITIONS(-DDISABLE_GRANT_OPTIONS)
 ENDIF(DISABLE_GRANT_OPTIONS)
 
-ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc
+ADD_EXECUTABLE(mysqld${MYSQLD_EXE_SUFFIX}
+	       ../sql-common/client.c derror.cc des_key_file.cc
                discover.cc ../libmysql/errmsg.c field.cc field_conv.cc 
                filesort.cc gstream.cc ha_blackhole.cc 
                ha_archive.cc ha_heap.cc ha_myisam.cc ha_myisammrg.cc
@@ -82,7 +83,8 @@ ADD_EXECUTABLE(mysqld ../sql-common/clie
 			   ${PROJECT_SOURCE_DIR}/include/mysql_version.h 
 			   ${PROJECT_SOURCE_DIR}/sql/lex_hash.h)
 
-TARGET_LINK_LIBRARIES(mysqld heap myisam myisammrg mysys yassl zlib dbug yassl 
+TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX}
+		      heap myisam myisammrg mysys yassl zlib dbug yassl 
                       taocrypt strings vio regex wsock32)
 
 IF(EMBED_MANIFESTS)
@@ -90,19 +92,19 @@ IF(EMBED_MANIFESTS)
 ENDIF(EMBED_MANIFESTS)
 
 IF(WITH_EXAMPLE_STORAGE_ENGINE)
-  TARGET_LINK_LIBRARIES(mysqld example)
+  TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} example)
 ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
 
 IF(WITH_INNOBASE_STORAGE_ENGINE)
-  TARGET_LINK_LIBRARIES(mysqld innobase)
+  TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} innobase)
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
 
 IF(WITH_BERKELEY_STORAGE_ENGINE)
-  TARGET_LINK_LIBRARIES(mysqld bdb)
+  TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} bdb)
 ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
 
 
-ADD_DEPENDENCIES(mysqld GenError)
+ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFFIX} GenError)
 
 # Sql Parser custom command
 ADD_CUSTOM_COMMAND(
@@ -134,7 +136,7 @@ ADD_CUSTOM_COMMAND(
 	COMMAND ${GEN_LEX_HASH_EXE} ARGS > lex_hash.h
 	DEPENDS ${GEN_LEX_HASH_EXE}
 )
-ADD_DEPENDENCIES(mysqld gen_lex_hash)
+ADD_DEPENDENCIES(mysqld${MYSQLD_EXE_SUFFIX} gen_lex_hash)
 
 ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)
 ADD_DEPENDENCIES(udf_example strings)
diff -Nrup a/win/configure.js b/win/configure.js
--- a/win/configure.js	2007-04-23 21:41:22 +02:00
+++ b/win/configure.js	2007-07-18 15:42:09 +02:00
@@ -51,6 +51,7 @@ try 
                     configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
                     break;
             case "MYSQL_SERVER_SUFFIX":
+            case "MYSQLD_EXE_SUFFIX":
                     configfile.WriteLine("SET (" + parts[0] + " \""
                                          + parts[1] + "\")");
                     break;