diff options
| -rw-r--r-- | cmakelists.txt | 55 | ||||
| -rw-r--r-- | libmysqld/cmakelists.txt | 86 | ||||
| -rw-r--r-- | libmysqld/examples/cmakelists.txt | 11 | ||||
| -rw-r--r-- | libmysqld/lib_sql.cc | 2 | ||||
| -rw-r--r-- | libmysqld/libmysqld.def | 1 | ||||
| -rw-r--r-- | sql/cmakelists.txt | 51 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 | ||||
| -rw-r--r-- | strings/cmakelists.txt | 3 |
8 files changed, 157 insertions, 54 deletions
diff --git a/cmakelists.txt b/cmakelists.txt index a5bdb1a7894..70b017c757d 100644 --- a/cmakelists.txt +++ b/cmakelists.txt @@ -5,6 +5,52 @@ INCLUDE(win/configure.data) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY) + +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") + SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_archive.cc") +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") + SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_blackhole.cc") +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") + SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_innodb.cc") +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") + SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_partition.cc") +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") + SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_federated.cc") +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") + SET (mysql_se_ha_src ${mysql_se_ha_src} "../sql/ha_berkeley.cc") +ENDIF(WITH_BERKELEY_STORAGE_ENGINE) + +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/handlerton.cc.in + ${CMAKE_SOURCE_DIR}/sql/handlerton.cc @ONLY) + 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) @@ -17,6 +63,13 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-medium.cnf.sh CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/support-files/my-small.cnf.sh ${CMAKE_SOURCE_DIR}/support-files/my-small.ini @ONLY) +IF(__NT__) + ADD_DEFINITIONS(-D __NT__) +ENDIF(__NT__) +IF(CYBOZU) + ADD_DEFINITIONS(-D CYBOZU) +ENDIF(CYBOZU) + # 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") @@ -85,3 +138,5 @@ ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(server-tools/instance-manager) ADD_SUBDIRECTORY(libmysql) ADD_SUBDIRECTORY(tests) +ADD_SUBDIRECTORY(libmysqld) +ADD_SUBDIRECTORY(libmysqld/examples) diff --git a/libmysqld/cmakelists.txt b/libmysqld/cmakelists.txt new file mode 100644 index 00000000000..a11a0dffd33 --- /dev/null +++ b/libmysqld/cmakelists.txt @@ -0,0 +1,86 @@ +SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") +SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") + +# Need to set USE_TLS, since __declspec(thread) approach to thread local +# storage does not work properly in DLLs. +ADD_DEFINITIONS(-DUSE_TLS -DHAVE_ROW_BASED_REPLICATION -DMYSQL_SERVER + -DEMBEDDED_LIBRARY) + +# The old Windows build method used renamed (.cc -> .cpp) source files, fails +# in #include in lib_sql.cc. So disable that using the USING_CMAKE define. +ADD_DEFINITIONS(-DUSING_CMAKE) + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/libmysqld + ${CMAKE_SOURCE_DIR}/libmysql + ${CMAKE_SOURCE_DIR}/sql + ${CMAKE_SOURCE_DIR}/regex + ${CMAKE_SOURCE_DIR}/extra/yassl/include + ${CMAKE_SOURCE_DIR}/storage/bdb/build_win32 + ${CMAKE_SOURCE_DIR}/zlib +) + +ADD_LIBRARY(mysqldemb emb_qcache.cc libmysqld.c lib_sql.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 + ../sql-common/pack.c ../sql/derror.cc ../sql/event_executor.cc + ../sql/event_timed.cc ../sql/event.cc ../sql/discover.cc + ../sql/field_conv.cc ../sql/field.cc ../sql/filesort.cc + ../sql/gstream.cc ../sql/ha_heap.cc ../sql/ha_myisam.cc + ../sql/ha_myisammrg.cc ${mysql_se_ha_src} + ../sql/handler.cc ../sql/handlerton-win.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 + ../sql/item_func.cc ../sql/item_geofunc.cc ../sql/item_row.cc + ../sql/item_strfunc.cc ../sql/item_subselect.cc ../sql/item_sum.cc + ../sql/item_timefunc.cc ../sql/item_uniq.cc ../sql/item_xmlfunc.cc + ../sql/key.cc ../sql/lock.cc ../sql/log.cc ../sql/log_event.cc + ../sql/mf_iocache.cc ../sql/my_decimal.cc ../sql/net_serv.cc + ../sql/opt_range.cc ../sql/opt_sum.cc ../sql/parse_file.cc + ../sql/procedure.cc ../sql/protocol.cc ../sql/records.cc + ../sql/repl_failsafe.cc ../sql/rpl_filter.cc ../sql/set_var.cc + ../sql/spatial.cc ../sql/sp_cache.cc ../sql/sp.cc + ../sql/sp_head.cc ../sql/sp_pcontext.cc ../sql/sp_rcontext.cc + ../sql/sql_acl.cc ../sql/sql_analyse.cc ../sql/sql_base.cc + ../sql/sql_cache.cc ../sql/sql_class.cc ../sql/sql_crypt.cc + ../sql/sql_cursor.cc ../sql/sql_db.cc ../sql/sql_delete.cc + ../sql/sql_derived.cc ../sql/sql_do.cc ../sql/sql_error.cc + ../sql/sql_handler.cc ../sql/sql_help.cc ../sql/sql_insert.cc + ../sql/sql_lex.cc ../sql/sql_list.cc ../sql/sql_load.cc + ../sql/sql_manager.cc ../sql/sql_map.cc ../sql/sql_parse.cc + ../sql/sql_partition.cc ../sql/sql_plugin.cc ../sql/sql_prepare.cc + ../sql/sql_rename.cc ../sql/sql_repl.cc ../sql/sql_select.cc + ../sql/sql_show.cc ../sql/sql_state.c ../sql/sql_string.cc + ../sql/sql_tablespace.cc ../sql/sql_table.cc ../sql/sql_test.cc + ../sql/sql_trigger.cc ../sql/sql_udf.cc ../sql/sql_union.cc + ../sql/sql_update.cc ../sql/sql_view.cc ../sql/sql_yacc.cc + ../sql/strfunc.cc ../sql/table.cc ../sql/thr_malloc.cc + ../sql/time.cc ../sql/tztime.cc ../sql/uniques.cc ../sql/unireg.cc + ../sql/partition_info.cc ../vio/vio.c + ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c) + +# Seems we cannot make a library without at least one source file. So use a +# dummy empty file +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) +IF(WITH_ARCHIVE_STORAGE_ENGINE) + ADD_DEPENDENCIES(mysqlserver archive) +ENDIF(WITH_ARCHIVE_STORAGE_ENGINE) +IF(WITH_EXAMPLE_STORAGE_ENGINE) + ADD_DEPENDENCIES(mysqlserver example) +ENDIF(WITH_EXAMPLE_STORAGE_ENGINE) +IF(WITH_INNOBASE_STORAGE_ENGINE) + ADD_DEPENDENCIES(mysqlserver innobase) +ENDIF(WITH_INNOBASE_STORAGE_ENGINE) +IF(WITH_BERKELEY_STORAGE_ENGINE) + ADD_DEPENDENCIES(mysqlserver bdb) +ENDIF(WITH_BERKELEY_STORAGE_ENGINE) + +ADD_LIBRARY(libmysqld MODULE cmake_dummy.c libmysqld.def) +TARGET_LINK_LIBRARIES(libmysqld wsock32) +ADD_DEPENDENCIES(libmysqld mysqlserver) diff --git a/libmysqld/examples/cmakelists.txt b/libmysqld/examples/cmakelists.txt new file mode 100644 index 00000000000..5c58264a7e7 --- /dev/null +++ b/libmysqld/examples/cmakelists.txt @@ -0,0 +1,11 @@ +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/libmysqld/include + ${CMAKE_SOURCE_DIR}/extra/yassl/include) + +# Currently does not work with DBUG, there are missing symbols reported. +ADD_DEFINITIONS(-DDBUG_OFF) +ADD_EXECUTABLE(test_libmysqld ../../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) diff --git a/libmysqld/lib_sql.cc b/libmysqld/lib_sql.cc index 6c520797d4f..70022d526a5 100644 --- a/libmysqld/lib_sql.cc +++ b/libmysqld/lib_sql.cc @@ -28,7 +28,7 @@ extern "C" extern unsigned long max_allowed_packet, net_buffer_length; } -#if defined (__WIN__) +#if defined(__WIN__) && !defined(USING_CMAKE) #include "../sql/mysqld.cpp" #else #include "../sql/mysqld.cc" diff --git a/libmysqld/libmysqld.def b/libmysqld/libmysqld.def index 93456901a7d..8b930c1ba1e 100644 --- a/libmysqld/libmysqld.def +++ b/libmysqld/libmysqld.def @@ -18,6 +18,7 @@ EXPORTS list_delete load_defaults max_allowed_packet + my_cgets my_end my_getopt_print_errors my_init diff --git a/sql/cmakelists.txt b/sql/cmakelists.txt index 0d06a11ebba..381d22c605c 100644 --- a/sql/cmakelists.txt +++ b/sql/cmakelists.txt @@ -22,61 +22,10 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc ${PROJECT_SOURCE_DIR}/include/mysqld_ername.h ${PROJECT_SOURCE_DIR}/include/sql_state.h PROPERTIES GENERATED 1) - -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") - SET (mysql_se_ha_src "${mysql_se_ha_src} ha_archive.cc") -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") - SET (mysql_se_ha_src "${mysql_se_ha_src} ha_blackhole.cc") -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") - SET (mysql_se_ha_src "${mysql_se_ha_src} ha_innodb.cc") - 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_se_htons "${mysql_se_htons}, &federated_hton") - SET (mysql_se_decls "${mysql_se_decls}, federated_hton") - SET (mysql_se_ha_src "${mysql_se_ha_src} ha_federated.cc") -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") - SET (mysql_se_ha_src "${mysql_se_ha_src} ha_berkeley.cc") -ENDIF(WITH_BERKELEY_STORAGE_ENGINE) -IF(__NT__) - ADD_DEFINITIONS(-D __NT__) -ENDIF(__NT__) -IF(CYBOZU) - ADD_DEFINITIONS(-D CYBOZU) -ENDIF(CYBOZU) -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) -SEPARATE_ARGUMENTS(mysql_se_ha_src) 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_heap.cc ha_myisam.cc ha_myisammrg.cc diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 584c3727dd6..71067630535 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3370,7 +3370,7 @@ static void create_shutdown_thread() } -#if defined(__NT__) || defined(HAVE_SMEM) +#if (defined(__NT__) || defined(HAVE_SMEM)) && !defined(EMBEDDED_LIBRARY) static void handle_connections_methods() { pthread_t hThread; diff --git a/strings/cmakelists.txt b/strings/cmakelists.txt index 7b78e5f6b39..ab4031f071a 100644 --- a/strings/cmakelists.txt +++ b/strings/cmakelists.txt @@ -8,4 +8,5 @@ ADD_LIBRARY(strings bchange.c bcmp.c bfill.c bmove512.c bmove_upp.c ctype-big5.c ctype-ucs2.c ctype-ujis.c ctype-utf8.c ctype-win1250ch.c ctype.c decimal.c int2str.c is_prefix.c llstr.c longlong2str.c my_strtoll10.c my_vsnprintf.c r_strinstr.c str2int.c str_alloc.c strcend.c strend.c strfill.c strmake.c strmov.c strnmov.c - strtod.c strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c my_strchr.c) + strtod.c strtol.c strtoll.c strtoul.c strtoull.c strxmov.c strxnmov.c xml.c + my_strchr.c strcont.c strinstr.c) |