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-12 16:17:26+02:00, georg@stripped +6 -0
CMake fixes for
- Win64
- libmysqld (embedded server)
- multi processor build
CMakeLists.txt@stripped, 2006-09-12 16:17:21+02:00, georg@stripped +12 -0
Readded storage engine variable for embedded server
libmysqld/CMakeLists.txt@stripped, 2006-09-12 16:17:21+02:00, georg@stripped +9 -3
Fixes for embedded server
libmysqld/examples/CMakeLists.txt@stripped, 2006-09-12 16:17:21+02:00, georg@stripped +3 -3
renamed test_libmysqld to mysqltest_embedded (required by mysql-test-run.pl)
mysql-test/mysql-test-run.pl@stripped, 2006-09-12 16:17:21+02:00, georg@stripped +3 -1
fixed path for embedded test
regex/CMakeLists.txt@stripped, 2006-09-12 16:17:21+02:00, georg@stripped +1 -0
added missing dependency (unireg.h requires mysqld_error.h)
sql/CMakeLists.txt@stripped, 2006-09-12 16:17:21+02:00, georg@stripped +10 -20
fixed stprage engine support
changed custom_commands to target for Lex/Yacc/Msg
# 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.155/mysql-test/mysql-test-run.pl 2006-09-12 16:17:37 +02:00
+++ 1.156/mysql-test/mysql-test-run.pl 2006-09-12 16:17:37 +02:00
@@ -1205,7 +1205,9 @@
if ( $glob_use_embedded_server )
{
my $path_examples= "$glob_basedir/libmysqld/examples";
- $exe_mysqltest= mtr_exe_exists("$path_examples/mysqltest_embedded");
+ $exe_mysqltest= mtr_exe_exists("$path_examples/mysqltest_embedded",
+ "$path_examples/release/mysqltest_embedded",
+ "$path_examples/debug/mysqltest_embedded");
$exe_mysql_client_test=
mtr_exe_exists("$path_examples/mysql_client_test_embedded",
"/usr/bin/false");
--- 1.10/libmysqld/CMakeLists.txt 2006-09-12 16:17:37 +02:00
+++ 1.11/libmysqld/CMakeLists.txt 2006-09-12 16:17:37 +02:00
@@ -23,7 +23,7 @@
${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
PROPERTIES GENERATED 1)
-ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc
+ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.cc rpl_injector.cc
../client/get_password.c ../libmysql/errmsg.c
../libmysql/libmysql.c ../sql/password.c ../sql-common/client.c
../sql-common/my_time.c ../sql-common/my_user.c
@@ -31,6 +31,7 @@
../sql/event_timed.cc ../sql/events.cc ../sql/discover.cc
../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc
../sql/gstream.cc ${mysql_se_ha_src}
+ ../sql/sql_builtin.cc
../sql/handler.cc ../sql/hash_filo.cc
../sql/hostname.cc ../sql/init.cc ../sql/item_buff.cc
../sql/item_cmpfunc.cc ../sql/item.cc ../sql/item_create.cc
@@ -67,25 +68,30 @@
# Seems we cannot make a library without at least one source file. So use a
# dummy empty file
+ADD_DEPENDENCIES(mysqldemb gen_lex_hash SqlYacc SqlMessage GenError)
FILE(WRITE cmake_dummy.c " ")
ADD_LIBRARY(mysqlserver cmake_dummy.c)
-TARGET_LINK_LIBRARIES(mysqlserver wsock32)
ADD_DEPENDENCIES(mysqlserver dbug mysys strings zlib mysqldemb regex myisam myisammrg
heap yassl taocrypt)
+TARGET_LINK_LIBRARIES(mysqlserver wsock32)
IF(WITH_ARCHIVE_STORAGE_ENGINE)
ADD_DEPENDENCIES(mysqlserver archive)
+ TARGET_LINK_LIBRARIES(mysqlserver archive)
ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
IF(WITH_EXAMPLE_STORAGE_ENGINE)
ADD_DEPENDENCIES(mysqlserver example)
+ TARGET_LINK_LIBRARIES(mysqlserver example)
ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
IF(WITH_FEDERATED_STORAGE_ENGINE)
ADD_DEPENDENCIES(mysqlserver federated)
+ TARGET_LINK_LIBRARIES(mysqlserver federated)
ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
IF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_DEPENDENCIES(mysqlserver innobase)
+ TARGET_LINK_LIBRARIES(mysqlserver innobase)
ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_LIBRARY(libmysqld MODULE cmake_dummy.c libmysqld.def)
-TARGET_LINK_LIBRARIES(libmysqld wsock32)
ADD_DEPENDENCIES(libmysqld mysqlserver)
+TARGET_LINK_LIBRARIES(libmysqld wsock32)
--- 1.3/libmysqld/examples/CMakeLists.txt 2006-09-12 16:17:37 +02:00
+++ 1.4/libmysqld/examples/CMakeLists.txt 2006-09-12 16:17:37 +02:00
@@ -4,8 +4,8 @@
# Currently does not work with DBUG, there are missing symbols reported.
ADD_DEFINITIONS(-DDBUG_OFF)
-ADD_EXECUTABLE(test_libmysqld ../../client/completion_hash.cc
+ADD_EXECUTABLE(mysqltest_embedded ../../client/completion_hash.cc
../../client/mysql.cc ../../client/readline.cc
../../client/sql_string.cc)
-TARGET_LINK_LIBRARIES(test_libmysqld yassl taocrypt zlib wsock32)
-ADD_DEPENDENCIES(test_libmysqld libmysqld)
+ADD_DEPENDENCIES(mysqltest_embedded libmysqld)
+TARGET_LINK_LIBRARIES(mysqltest_embedded yassl taocrypt zlib wsock32)
--- 1.24/CMakeLists.txt 2006-09-12 16:17:37 +02:00
+++ 1.25/CMakeLists.txt 2006-09-12 16:17:37 +02:00
@@ -12,43 +12,55 @@
SET(WITH_HEAP_STORAGE_ENGINE TRUE)
ADD_DEFINITIONS(-D WITH_HEAP_STORAGE_ENGINE)
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_heap_plugin")
+SET(mysql_se_ha_src "${mysql_se_ha_src} ../storage/heap/ha_heap.cc")
SET(WITH_MYISAM_STORAGE_ENGINE TRUE)
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(WITH_MYISAMMRG_STORAGE_ENGINE TRUE)
ADD_DEFINITIONS(-D WITH_MYISAMMRG_STORAGE_ENGINE)
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisammrg_plugin")
+SET(mysql_se_ha_src "${mysql_se_ha_src} ../storage/myisammrg/ha_myisammrg.cc")
IF(WITH_ARCHIVE_STORAGE_ENGINE)
ADD_DEFINITIONS(-D WITH_ARCHIVE_STORAGE_ENGINE)
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_archive_plugin")
+ SET(mysql_se_ha_src "${mysql_se_ha_src} ../storage/archive/ha_archive.cc")
ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)
IF(WITH_BLACKHOLE_STORAGE_ENGINE)
ADD_DEFINITIONS(-D WITH_BLACKHOLE_STORAGE_ENGINE)
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_blackhole_plugin")
+ SET(mysql_se_ha_src "${mysql_se_ha_src} ../storage/blackhole/ha_blackhole.cc")
ENDIF(WITH_BLACKHOLE_STORAGE_ENGINE)
IF(WITH_CSV_STORAGE_ENGINE)
ADD_DEFINITIONS(-D WITH_CSV_STORAGE_ENGINE)
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_csv_plugin")
+ SET(mysql_se_ha_src "${mysql_se_ha_src} ../storage/csv/ha_tina.cc")
ENDIF(WITH_CSV_STORAGE_ENGINE)
IF(WITH_EXAMPLE_STORAGE_ENGINE)
ADD_DEFINITIONS(-D WITH_EXAMPLE_STORAGE_ENGINE)
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_example_plugin")
+ SET(mysql_se_ha_src "${mysql_se_ha_src} ../storage/example/ha_example.cc")
ENDIF(WITH_EXAMPLE_STORAGE_ENGINE)
IF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")
+ SET(mysql_se_ha_src "${mysql_se_ha_src} ha_innodb.cc")
ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
IF(WITH_PARTITION_STORAGE_ENGINE)
ADD_DEFINITIONS(-D WITH_PARTITION_STORAGE_ENGINE)
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_partition_plugin")
+ SET(mysql_se_ha_src "${mysql_se_ha_src} ha_partition.cc")
ENDIF(WITH_PARTITION_STORAGE_ENGINE)
IF(WITH_FEDERATED_STORAGE_ENGINE)
ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_federated_plugin")
+ SET(mysql_se_ha_src "${mysql_se_ha_src} ../storage/federated/ha_federated.cc")
ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
+
+SEPARATE_ARGUMENTS(mysql_se_ha_src)
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc @ONLY)
--- 1.6/regex/CMakeLists.txt 2006-09-12 16:17:37 +02:00
+++ 1.7/regex/CMakeLists.txt 2006-09-12 16:17:37 +02:00
@@ -3,3 +3,4 @@
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
ADD_LIBRARY(regex debug.c regcomp.c regerror.c regexec.c regfree.c reginit.c split.c)
+ADD_DEPENDENCIES(regex GenError)
--- 1.31/sql/CMakeLists.txt 2006-09-12 16:17:37 +02:00
+++ 1.32/sql/CMakeLists.txt 2006-09-12 16:17:37 +02:00
@@ -28,7 +28,7 @@
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_innodb.cc ha_partition.cc
+ ${mysql_se_ha_src}
handler.cc hash_filo.cc hash_filo.h
hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc
item_create.cc item_func.cc item_geofunc.cc item_row.cc
@@ -82,28 +82,17 @@
TARGET_LINK_LIBRARIES(mysqld innobase)
ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
-ADD_DEPENDENCIES(mysqld GenError)
-
# Sql Parser custom command
-ADD_CUSTOM_COMMAND(
- SOURCE ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy
- OUTPUT ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
- COMMAND bison.exe ARGS -y -p MYSQL --defines=sql_yacc.h
- --output=sql_yacc.cc sql_yacc.yy
- DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy)
-
-ADD_CUSTOM_COMMAND(
- OUTPUT ${PROJECT_SOURCE_DIR}/sql/sql_yacc.h
- COMMAND echo
- DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.cc
+ADD_CUSTOM_TARGET(SqlYacc
+ COMMAND bison.exe -y -p MYSQL --defines=sql_yacc.h --output=sql_yacc.cc sql_yacc.yy
+ DEPENDS ${PROJECT_SOURCE_DIR}/sql/sql_yacc.yy
)
# Windows message file
-ADD_CUSTOM_COMMAND(
- SOURCE message.mc
- OUTPUT message.rc message.h
- COMMAND mc ARGS message.mc
- DEPENDS message.mc)
+ADD_CUSTOM_TARGET(SqlMessage
+ COMMAND mc message.mc
+ DEPENDS message.mc
+)
# Gen_lex_hash
ADD_EXECUTABLE(gen_lex_hash gen_lex_hash.cc)
@@ -115,4 +104,5 @@
DEPENDS ${GEN_LEX_HASH_EXE}
)
-ADD_DEPENDENCIES(mysqld gen_lex_hash)
+ADD_DEPENDENCIES(mysqld gen_lex_hash SqlYacc SqlMessage GenError)
+
| Thread |
|---|
| • bk commit into 5.1 tree (georg:1.2308) | georg | 12 Sep |
