Below is the list of changes that have just been committed into a local
5.1 repository of . When 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.2238 06/03/27 15:19:56 reggie@big_geek. +4 -0
removed handlerton-win.cc
now using CONFIGURE_FILE and INCLUDE to generate handlerton.cc and to set the definitions based on
the storage engines given on the command line
win/configure.js
1.3 06/03/27 15:19:46 reggie@big_geek. +21 -1
write out proper cmake code instead of just the values.
sql/cmakelists.txt
1.12 06/03/27 15:19:46 reggie@big_geek. +42 -44
include IF() blocks for every storage engine and set two vars that are used with CONFIGURE_FILE later
in the script.
This CONFIGURE_FILE call replaces the need for config-handlerton.js
cmakelists.txt
1.9 06/03/27 15:19:45 reggie@big_geek. +8 -7
use INCLUDE to read in the cmake file generated as part of configure
comment out the setting of /wd4996 since we are using the -D flag instead
BitKeeper/deleted/.del-handlerton-win.cc~322a7e59507976df
1.2 06/03/27 15:10:27 reggie@big_geek. +0 -0
Delete: sql/handlerton-win.cc
# 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: reggie
# Host: big_geek.
# Root: C:/Work/mysql/mysql-5.1
--- 1.8/cmakelists.txt 2006-03-15 10:02:39 -06:00
+++ 1.9/cmakelists.txt 2006-03-27 15:19:45 -06:00
@@ -1,17 +1,18 @@
PROJECT(MySql)
EXEC_PROGRAM(cscript.exe win ARGS config-version.js OUT_VARIABLE out)
+INCLUDE(win/configure.data)
# in some places we use DBUG_OFF
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF")
-IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")
- SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")
- SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")
-ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
+#IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
+# SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996")
+# SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /wd4996")
+# SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996")
+# SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996")
+#ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8")
# replace /MDd with /MTd
@@ -29,7 +30,7 @@
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")
-ADD_DEFINITIONS("-D_WINDOWS -D__WIN__")
+ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE")
SUBDIRS(vio dbug strings regex mysys extra/yassl extra/yassl/taocrypt extra
zlib storage/innobase storage/heap storage/myisam storage/myisammrg
--- 1.11/sql/cmakelists.txt 2006-03-16 07:55:50 -06:00
+++ 1.12/sql/cmakelists.txt 2006-03-27 15:19:46 -06:00
@@ -18,8 +18,47 @@
${PROJECT_SOURCE_DIR}/include/mysqld_ername.h
${PROJECT_SOURCE_DIR}/include/sql_state.h PROPERTIES GENERATED 1)
-ADD_DEFINITIONS(-DWITH_INNOBASE_STORAGE_ENGINE -DHAVE_ARCHIVE_DB -DHAVE_BLACKHOLE_DB -DHAVE_EXAMPLE_DB)
-ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DHAVE_FEDERATED_DB -DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN -DWITH_PARTITION_STORAGE_ENGINE -D_CRT_SECURE_NO_DEPRECATE)
+IF(WITH_ARCHIVE_STORAGE_ENGINE)
+ ADD_DEFINITIONS(-D WITH_ARCHIVE_STORAGE_ENGINE)
+ SET (mysql_se_htons "${mysql_se_htons}, &archive_hton")
+ SET (mysql_se_decls "${mysql_se_decls}, archive_hton")
+ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
+IF(WITH_BLACKHOLE_STORAGE_ENGINE)
+ ADD_DEFINITIONS(-D WITH_BLACKHOLE_STORAGE_ENGINE)
+ SET (mysql_se_htons "${mysql_se_htons}, &blackhole_hton")
+ SET (mysql_se_decls "${mysql_se_decls}, blackhole_hton")
+ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)
+IF(WITH_EXAMPLE_STORAGE_ENGINE)
+ ADD_DEFINITIONS(-D WITH_EXAMPLE_STORAGE_ENGINE)
+ SET (mysql_se_htons "${mysql_se_htons}, &example_hton")
+ SET (mysql_se_decls "${mysql_se_decls}, example_hton")
+ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
+IF(WITH_INNOBASE_STORAGE_ENGINE)
+ ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)
+ SET (mysql_se_htons "${mysql_se_htons}, &innobase_hton")
+ SET (mysql_se_decls "${mysql_se_decls}, innobase_hton")
+ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
+IF(WITH_PARTITION_STORAGE_ENGINE)
+ ADD_DEFINITIONS(-D WITH_PARTITION_STORAGE_ENGINE)
+ SET (mysql_se_htons "${mysql_se_htons}, &partition_hton")
+ SET (mysql_se_decls "${mysql_se_decls}, partition_hton")
+ENDIF(WITH_PARTITION_STORAGE_ENGINE)
+IF(WITH_FEDERATED_STORAGE_ENGINE)
+ ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)
+ SET (mysql_se_htons "${mysql_se_htons}, &federated_hton")
+ SET (mysql_se_decls "${mysql_se_decls}, federated_hton")
+ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
+IF(WITH_BERKELEY_STORAGE_ENGINE)
+ ADD_DEFINITIONS(-D WITH_BERKELEY_STORAGE_ENGINE)
+ SET (mysql_se_htons "${mysql_se_htons}, &berkeley_hton")
+ SET (mysql_se_decls "${mysql_se_decls}, berkeley_hton")
+ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
+IF(__NT__)
+ ADD_DEFINITIONS(-D __NT__)
+ENDIF(__NT__)
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in ${CMAKE_SOURCE_DIR}/sql/handlerton.cc @ONLY)
+
+ADD_DEFINITIONS(-DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN)
ADD_EXECUTABLE(mysqld ../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
@@ -67,51 +106,10 @@
# Windows message file
ADD_CUSTOM_COMMAND(
- SOURCE ../VC++Files/sql/message.mc
+ SOURCE ../VC++Files/sql/messae.mc
OUTPUT message.rc message.h
COMMAND mc ARGS ../VC++Files/sql/message.mc
DEPENDS ../VC++Files/sql/message.mc)
-
-# MySql_version.h.
-#ADD_CUSTOM_COMMAND(
-# SOURCE ${PROJECT_SOURCE_DIR}/include/mysql_version.h.in
-# OUTPUT ${PROJECT_SOURCE_DIR}/include/mysql_version.h
-# COMMAND cscript.exe ${PROJECT_SOURCE_DIR}/win/config-version.js
-# DEPENDS ${PROJECT_SOURCE_DIR}/include/mysql_version.h.in)
-
-# Handlerton file
-ADD_CUSTOM_COMMAND(
- SOURCE ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in
- OUTPUT ${PROJECT_SOURCE_DIR}/sql/handlerton.cc
- COMMAND cscript.exe ${PROJECT_SOURCE_DIR}/win/config-handlerton.js ARGS ${PROJECT_SOURCE_DIR}/win/configure.data
- DEPENDS ${PROJECT_SOURCE_DIR}/sql/handlerton.cc.in)
-
-# Error file
-#GET_TARGET_PROPERTY(COMP_ERR_EXE comp_err LOCATION)
-#ADD_CUSTOM_COMMAND(
- #SOURCE ${PROJECT_SOURCE_DIR}/sql/share/errmsg.txt
- #OUTPUT ${PROJECT_SOURCE_DIR}/include/mysqld_error.h
- #COMMAND ${COMP_ERR_EXE}
- #ARGS --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets
- # --out-dir=${PROJECT_SOURCE_DIR}/sql/share/
-## --header_file=${PROJECT_SOURCE_DIR}/include/mysqld_error.h
-# --name_file=${PROJECT_SOURCE_DIR}/include/mysqld_ername.h
-# --state_file=${PROJECT_SOURCE_DIR}/include/sql_state.h
- # --in_file=${PROJECT_SOURCE_DIR}/sql/share/errmsg.txt
- # DEPENDS ${COMP_ERR_EXE} share/errmsg.txt)
-
-#ADD_CUSTOM_COMMAND(
-# OUTPUT ${PROJECT_SOURCE_DIR}/include/mysqld_ername.h
-# COMMAND echo
-# DEPENDS ${PROJECT_SOURCE_DIR}/include/mysqld_error.h
-#)
-
-#ADD_CUSTOM_COMMAND(
-# OUTPUT ${PROJECT_SOURCE_DIR}/include/sql_state.h
-# COMMAND echo
-# DEPENDS ${PROJECT_SOURCE_DIR}/include/mysqld_ername.h
-#)
-
# Gen_lex_hash
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
--- 1.2/win/configure.js 2006-01-31 13:09:53 -06:00
+++ 1.3/win/configure.js 2006-03-27 15:19:46 -06:00
@@ -14,7 +14,27 @@
var configfile = fso.CreateTextFile("win\\configure.data", true);
for (i=0; i < args.Count(); i++)
{
- configfile.WriteLine(args.Item(i));
+ var parts = args.Item(i).split('=');
+ switch (parts[0])
+ {
+ case "WITH_ARCHIVE_STORAGE_ENGINE":
+ case "WITH_BERKELEY_STORAGE_ENGINE":
+ case "WITH_BLACKHOLE_STORAGE_ENGINE":
+ case "WITH_EXAMPLE_STORAGE_ENGINE":
+ case "WITH_FEDERATED_STORAGE_ENGINE":
+ case "WITH_INNOBASE_STORAGE_ENGINE":
+ case "WITH_PARTITION_STORAGE_ENGINE":
+ case "__NT__":
+ line = "SET (" + args.Item(i) + " TRUE)";
+ break;
+ case "MYSQL_SERVER_SUFFIX":
+ case "COMPILATION_COMMENT":
+ case "MYSQL_TCP_PORT":
+ line = "SET (" + parts[0] + " " + parts[1] + ")";
+ break;
+ }
+
+ configfile.WriteLine(line);
}
configfile.Close();
| Thread |
|---|
| • bk commit into 5.1 tree (reggie:1.2238) | reggie | 27 Mar |
