andbu.bat config.cmake ndb/CMakeLists.txt ndb/config/type_kernel.cmake ndb/config/type_mgmapiclient.cmake ndb/config/type_ndbapi.cmake ndb/config/type_ndbapiclient.cmake ndb/config/type_ndbapitest.cmake ndb/config/type_ndbapitools.cmake ndb/config/type_util.cmake ndb/include/CMakeLists.txt ndb/src/CMakeLists.txt ndb/src/common/CMakeLists.txt ndb/src/common/debugger/CMakeLists.txt ndb/src/common/debugger/signaldata/CMakeLists.txt ndb/src/common/logger/CMakeLists.txt ndb/src/common/mgmcommon/CMakeLists.txt ndb/src/common/portlib/CMakeLists.txt ndb/src/common/transporter/CMakeLists.txt ndb/src/common/util/CMakeLists.txt ndb/src/kernel/CMakeLists.txt ndb/src/kernel/blocks/CMakeLists.txt ndb/src/kernel/blocks/backup/CMakeLists.txt ndb/src/kernel/blocks/cmvmi/CMakeLists.txt ndb/src/kernel/blocks/dbacc/CMakeLists.txt ndb/src/kernel/blocks/dbdict/CMakeLists.txt ndb/src/kernel/blocks/dbdih/CMakeLists.txt ndb/src/kernel/blocks/dblqh/CMakeLists.txt ndb/src/kernel/blocks/dbtc/CMakeLists.txt ndb/src/kernel/blocks/dbtup/CMakeLists.txt ndb/src/kernel/blocks/dbtux/CMakeLists.txt ndb/src/kernel/blocks/dbutil/CMakeLists.txt ndb/src/kernel/blocks/ndbcntr/CMakeLists.txt ndb/src/kernel/blocks/ndbfs/CMakeLists.txt ndb/src/kernel/blocks/qmgr/CMakeLists.txt ndb/src/kernel/blocks/suma/CMakeLists.txt ndb/src/kernel/blocks/trix/CMakeLists.txt ndb/src/kernel/error/CMakeLists.txt ndb/src/kernel/vm/CMakeLists.txt ndb/src/mgmapi/CMakeLists.txt ndb/src/mgmclient/CMakeLists.txt ndb/src/mgmsrv/CMakeLists.txt ndb/src/ndbapi/CMakeLists.txt ndb/test/CMakeLists.txt ndb/test/ndbapi/CMakeLists.txt ndb/test/ndbapi/bank/CMakeLists.txt ndb/test/ndbapi/old_dirs/flexBench/CMakeLists.txt ndb/test/src/CMakeLists.txt ndb/test/tools/CMakeLists.txt ndb/tools/CMakeLists.txt CMakeLists.txt Makefile.am client/CMakeLists.txt extra/CMakeLists.txt extra/yassl/taocrypt/taocrypt.vcproj extra/yassl/yassl.vcproj ndb/Makefile.am ndb/include/Makefile.am ndb/src/Makefile.am ndb/src/common/Makefile.am ndb/src/common/debugger/Makefile.am ndb/src/common/debugger/signaldata/Makefile.am ndb/src/common/logger/Makefile.am ndb/src/common/mgmcommon/Makefile.am ndb/src/common/portlib/Makefile.am ndb/src/common/transporter/Makefile.am ndb/src/common/util/Makefile.am ndb/src/kernel/Makefile.am ndb/src/kernel/blocks/Makefile.am ndb/src/kernel/blocks/backup/Makefile.am ndb/src/kernel/blocks/cmvmi/Makefile.am ndb/src/kernel/blocks/dbacc/Makefile.am ndb/src/kernel/blocks/dbdict/Makefile.am ndb/src/kernel/blocks/dbdih/Makefile.am ndb/src/kernel/blocks/dblqh/Makefile.am ndb/src/kernel/blocks/dbtc/Makefile.am ndb/src/kernel/blocks/dbtup/Makefile.am ndb/src/kernel/blocks/dbtux/Makefile.am ndb/src/kernel/blocks/dbutil/Makefile.am ndb/src/kernel/blocks/ndbcntr/Makefile.am ndb/src/kernel/blocks/ndbfs/Makefile.am ndb/src/kernel/blocks/qmgr/Makefile.am ndb/src/kernel/blocks/suma/Makefile.am ndb/src/kernel/blocks/trix/Makefile.am ndb/src/kernel/error/Makefile.am ndb/src/kernel/vm/Makefile.am ndb/src/mgmapi/Makefile.am ndb/src/mgmclient/Makefile.am ndb/src/mgmsrv/Makefile.am ndb/src/ndbapi/Makefile.am ndb/test/Makefile.am ndb/test/ndbapi/Makefile.am ndb/test/ndbapi/bank/Makefile.am ndb/test/ndbapi/old_dirs/flexBench/Makefile.am ndb/test/src/Makefile.am ndb/test/tools/Makefile.am ndb/tools/Makefile.am server-tools/instance-manager/mysqlmanager.vcproj sql/CMakeLists.txt win/configure.js ooo bzr diff -r1 -pa/:b/ . |di -x '\S+\.([hc]c?(pp)?|pl|test|in)\s' --- a/andbu.bat 1970-01-01 00:00:00 +0000 +++ b/andbu.bat 2007-09-08 14:56:30 +0000 @@ -0,0 +1,21 @@ +@setlocal +@set one=%1 + +if not "%1"=="conf" goto rest + +@win\configure.js WITH_NDBCLUSTER_STORAGE_ENGINE +@REM @call win\build-vs8.bat +@del cmakecache.txt +copy win\vs8cache.txt cmakecache.txt +cmake -G "Visual Studio 8 2005" +goto end + +:rest +@call "%VS80COMNTOOLS%vsvars32.bat" + +if "%one%"=="" set one=ndb_mgmd +set prj=/project %one% +if "%one%"=="all" set prj= +devenv.com MySql.sln %prj% /build debug +REM /out out.txt /log log.txt 2>&1 >std12.txt +:end --- a/config.cmake 1970-01-01 00:00:00 +0000 +++ b/config.cmake 2007-09-06 13:30:31 +0000 @@ -0,0 +1,96 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +FILE(READ "configure.in" CONFIGURE_IN) + +STRING(REGEX REPLACE ".*AM_INIT_AUTOMAKE\\(mysql, ([^)]+)\\).*" + "\\1" PARSE_VERSION "${CONFIGURE_IN}") + +STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" + "\\1.\\2" PARSE_BASE_VERSION "${VERSION}") +STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" + "\\1" PARSE_VERSION_MAJOR "${VERSION}") +STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" + "\\2" PARSE_VERSION_MINOR "${VERSION}") +STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" + "\\3" PARSE_VERSION_BUILD "${VERSION}") +IF(PARSE_VERSION_MINOR LESS 10) + SET(PARSE_VERSION_ID "${PARSE_VERSION_MAJOR}0${PARSE_VERSION_MINOR}") +ELSE(PARSE_VERSION_MINOR LESS 10) + SET(PARSE_VERSION_ID "${PARSE_VERSION_MAJOR}${PARSE_VERSION_MINOR}") +ENDIF(PARSE_VERSION_MINOR LESS 10) +IF(PARSE_VERSION_BUILD LESS 10) + SET(PARSE_VERSION_ID "${PARSE_VERSION_ID}0${PARSE_VERSION_BUILD}") +ELSE(PARSE_VERSION_BUILD LESS 10) + SET(PARSE_VERSION_ID "${PARSE_VERSION_ID}${PARSE_VERSION_BUILD}") +ENDIF(PARSE_VERSION_BUILD LESS 10) + +STRING(REGEX REPLACE ".*PROTOCOL_VERSION=([0-9]+).*" + "\\1" PARSE_PROTOCOL "${CONFIGURE_IN}") +STRING(REGEX REPLACE ".*DOT_FRM_VERSION=([0-9]+).*" + "\\1" PARSE_FRM_VERSION "${CONFIGURE_IN}") +STRING(REGEX REPLACE ".*MYSQL_TCP_PORT_DEFAULT=([0-9]+).*" + "\\1" PARSE_TCP_PORT "${CONFIGURE_IN}") +STRING(REGEX REPLACE ".*MYSQL_UNIX_ADDR_DEFAULT=\"([^\"]+)\".*" + "\\1" PARSE_UNIX_ADDR "${CONFIGURE_IN}") + +# Set some constant values +SET(PROTOCOL_VERSION "${PARSE_PROTOCOL}" CACHE STRING + "MySQL Protocol Version" FORCE) +SET(DOT_FRM_VERSION "${PARSE_FRM_VERSION}" CACHE STRING + "MySQL FRM Version" FORCE) +SET(MYSQL_TCP_PORT_DEFAULT "${PARSE_TCP_PORT}" CACHE STRING + "Default port for TCP connections" FORCE) +SET(MYSQL_UNIX_ADDR_DEFAULT "${PARSE_UNIX_ADDR}" CACHE STRING + "Default path for PIPE connections" FORCE) +SET(VERSION "${PARSE_VERSION}" CACHE STRING + "MySQL version" FORCE) +SET(MYSQL_BASE_VERSION "${PARSE_BASE_VERSION}" CACHE STRING + "Base MySQL version" FORCE) +SET(MYSQL_VERSION_ID "${PARSE_VERSION_ID}" CACHE STRING + "MySQL version identifier" FORCE) + + +# Set some default configuration values +SET(MYSQL_SERVER_SUFFIX "" CACHE STRING + "MySQL Server suffix") +SET(COMPILATION_COMMENT "Source distribution" CACHE STRING + "Source compilation comment") +SET(MYSQL_TCP_PORT "${MYSQL_TCP_PORT_DEFAULT}" CACHE STRING + "Port for TCP connections") +SET(MYSQL_UNIX_ADDR "${MYSQL_UNIX_ADDR_DEFAULT}" CACHE STRING + "Path for PIPE connections") + +SET(__NT__ TRUE CACHE BOOL "Target for Windows NT operating systems") + +SET(EMBED_MANIFESTS FALSE CACHE BOOL "Embed manifests") +SET(DISABLE_GRANT_OPTIONS FALSE CACHE BOOL "Disable grant options") + +SET(WITH_ARCHIVE_STORAGE_ENGINE FALSE CACHE BOOL "Include Archive engine") +SET(WITH_BERKELEY_STORAGE_ENGINE FALSE CACHE BOOL "Include Berkeley engine") +SET(WITH_BLACKHOLE_STORAGE_ENGINE FALSE CACHE BOOL "Include Blackhole engine") +SET(WITH_EXAMPLE_STORAGE_ENGINE FALSE CACHE BOOL "Include Example engine") +SET(WITH_FEDERATED_STORAGE_ENGINE FALSE CACHE BOOL "Include Federated") +SET(WITH_INNOBASE_STORAGE_ENGINE FALSE CACHE BOOL "Include InnoDB engine") +SET(WITH_NDBCLUSTER_STORAGE_ENGINE FALSE CACHE BOOL "Include NDB Cluster") + +SET(NDB_SCI_INCLUDES "" CACHE STRING "") +SET(NDB_SCI_LIBS "" CACHE STRING "") +SET(NDB_TEST TRUE CACHE BOOL "Include the NDB Cluster ndbapi test programs") +SET(ndb_port "1186" CACHE STRING "Port for NDB Cluster management server") +SET(ndb_port_base "default" CACHE STRING "Base port for NDB Cluster transporters") +SET(NDB_VERSION_MAJOR "${PARSE_VERSION_MAJOR}" CACHE STRING "NDB Major Version" FORCE) +SET(NDB_VERSION_MINOR "${PARSE_VERSION_MINOR}" CACHE STRING "NDB Minor Version" FORCE) +SET(NDB_VERSION_BUILD "${PARSE_VERSION_BUILD}" CACHE STRING "NDB Build Version" FORCE) --- a/ndb/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/CMakeLists.txt 2007-09-06 13:30:48 +0000 @@ -0,0 +1,22 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +ADD_SUBDIRECTORY(include) +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(tools) +IF(NDB_TEST) +ADD_SUBDIRECTORY(test) +ENDIF(NDB_TEST) +ADD_SUBDIRECTORY(docs) --- a/ndb/config/type_kernel.cmake 1970-01-01 00:00:00 +0000 +++ b/ndb/config/type_kernel.cmake 2007-09-06 13:30:48 +0000 @@ -0,0 +1,33 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/include + ${CMAKE_BINARY_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/ndb/src/kernel/vm + ${CMAKE_SOURCE_DIR}/ndb/src/kernel/error + ${CMAKE_SOURCE_DIR}/ndb/src/kernel + ${CMAKE_SOURCE_DIR}/ndb/include/kernel + ${CMAKE_SOURCE_DIR}/ndb/include/transporter + ${CMAKE_SOURCE_DIR}/ndb/include/debugger + ${CMAKE_SOURCE_DIR}/ndb/include/mgmapi + ${CMAKE_SOURCE_DIR}/ndb/include/mgmcommon + ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi + ${CMAKE_SOURCE_DIR}/ndb/include/util + ${CMAKE_SOURCE_DIR}/ndb/include/portlib + ${CMAKE_SOURCE_DIR}/ndb/include/logger) + --- a/ndb/config/type_mgmapiclient.cmake 1970-01-01 00:00:00 +0000 +++ b/ndb/config/type_mgmapiclient.cmake 2007-09-06 13:30:48 +0000 @@ -0,0 +1,16 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}//ndb/include/mgmapi) --- a/ndb/config/type_ndbapi.cmake 1970-01-01 00:00:00 +0000 +++ b/ndb/config/type_ndbapi.cmake 2007-09-06 13:30:48 +0000 @@ -0,0 +1,30 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/include + ${CMAKE_BINARY_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/mysys + ${CMAKE_SOURCE_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/ndb/include/kernel + ${CMAKE_SOURCE_DIR}/ndb/include/transporter + ${CMAKE_SOURCE_DIR}/ndb/include/debugger + ${CMAKE_SOURCE_DIR}/ndb/include/mgmapi + ${CMAKE_SOURCE_DIR}/ndb/include/mgmcommon + ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi + ${CMAKE_SOURCE_DIR}/ndb/include/util + ${CMAKE_SOURCE_DIR}/ndb/include/portlib + ${CMAKE_SOURCE_DIR}/ndb/include/logger) --- a/ndb/config/type_ndbapiclient.cmake 1970-01-01 00:00:00 +0000 +++ b/ndb/config/type_ndbapiclient.cmake 2007-09-06 13:30:48 +0000 @@ -0,0 +1,16 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/include/ndbapi) --- a/ndb/config/type_ndbapitest.cmake 1970-01-01 00:00:00 +0000 +++ b/ndb/config/type_ndbapitest.cmake 2007-09-06 13:30:48 +0000 @@ -0,0 +1,36 @@ +# Copyright (C) 2004, 2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +LINK_LIBRARIES(ndbNDBT + ndbclient + dbug + mysys + strings + ${NDB_SCI_LIBS}) +IF(WIN32) +LINK_LIBRARIES(wsock32) +ENDIF(WIN32) + + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/include + ${CMAKE_BINARY_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi + ${CMAKE_SOURCE_DIR}/ndb/include/util + ${CMAKE_SOURCE_DIR}/ndb/include/portlib + ${CMAKE_SOURCE_DIR}/ndb/test/include + ${CMAKE_SOURCE_DIR}/ndb/include/mgmapi) --- a/ndb/config/type_ndbapitools.cmake 1970-01-01 00:00:00 +0000 +++ b/ndb/config/type_ndbapitools.cmake 2007-09-06 13:30:48 +0000 @@ -0,0 +1,35 @@ +# Copyright (C) 2004, 2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +LINK_LIBRARIES(ndbclient + dbug + mysys + strings + ${NDB_SCI_LIBS}) +IF(WIN32) +LINK_LIBRARIES(wsock32) +ENDIF(WIN32) + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/include + ${CMAKE_BINARY_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi + ${CMAKE_SOURCE_DIR}/ndb/include/util + ${CMAKE_SOURCE_DIR}/ndb/include/portlib + ${CMAKE_SOURCE_DIR}/ndb/test/include + ${CMAKE_SOURCE_DIR}/ndb/include/mgmapi + ${CMAKE_SOURCE_DIR}/ndb/include/kernel) --- a/ndb/config/type_util.cmake 1970-01-01 00:00:00 +0000 +++ b/ndb/config/type_util.cmake 2007-09-06 13:30:48 +0000 @@ -0,0 +1,24 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/include + ${CMAKE_BINARY_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/mysys + ${CMAKE_SOURCE_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/ndb/include/util + ${CMAKE_SOURCE_DIR}/ndb/include/portlib + ${CMAKE_SOURCE_DIR}/ndb/include/logger) --- a/ndb/include/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/include/CMakeLists.txt 2007-09-06 13:30:48 +0000 @@ -0,0 +1,33 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +INCLUDE(CheckTypeSize) +CHECK_TYPE_SIZE(char NDB_SIZEOF_CHAR) +CHECK_TYPE_SIZE(short NDB_SIZEOF_SHORT) +CHECK_TYPE_SIZE(int NDB_SIZEOF_INT) +CHECK_TYPE_SIZE(long NDB_SIZEOF_LONG) +CHECK_TYPE_SIZE("char*" NDB_SIZEOF_CHARP) +CHECK_TYPE_SIZE("long long" NDB_SIZEOF_LONG_LONG) + + +CONFIGURE_FILE(ndb_global.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/ndb_global.h + @ONLY) +CONFIGURE_FILE(ndb_types.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/ndb_types.h + @ONLY) +CONFIGURE_FILE(ndb_version.h.in + ${CMAKE_CURRENT_SOURCE_DIR}/ndb_version.h + @ONLY) --- a/ndb/src/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/CMakeLists.txt 2007-09-06 13:30:48 +0000 @@ -0,0 +1,67 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +ADD_SUBDIRECTORY(common) +ADD_SUBDIRECTORY(mgmapi) +ADD_SUBDIRECTORY(ndbapi) +ADD_SUBDIRECTORY(kernel) +ADD_SUBDIRECTORY(mgmclient) +ADD_SUBDIRECTORY(mgmsrv) +ADD_SUBDIRECTORY(cw) + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) + +IF(WIN32) +FILE(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/dummy.cpp "") +SET_SOURCE_FILES_PROPERTIES(dummy.cpp PROPERTIES GENERATED TRUE) +ADD_LIBRARY(ndbclient STATIC dummy.cpp) +ADD_CUSTOM_COMMAND(TARGET ndbclient + POST_BUILD + COMMAND "LIB" + "/OUT:${CMAKE_CURRENT_BINARY_DIR}/ndbclient.lib" + "${CMAKE_CURRENT_BINARY_DIR}/ndbapi/${CMAKE_CFG_INTDIR}/ndbapi.lib" + "${CMAKE_CURRENT_BINARY_DIR}/common/transporter/${CMAKE_CFG_INTDIR}/ndbtransport.lib" + "${CMAKE_CURRENT_BINARY_DIR}/common/debugger/${CMAKE_CFG_INTDIR}/ndbtrace.lib" + "${CMAKE_CURRENT_BINARY_DIR}/common/debugger/signaldata/${CMAKE_CFG_INTDIR}/ndbsignaldata.lib" + "${CMAKE_CURRENT_BINARY_DIR}/mgmapi/${CMAKE_CFG_INTDIR}/ndbmgmapi.lib" + "${CMAKE_CURRENT_BINARY_DIR}/common/mgmcommon/${CMAKE_CFG_INTDIR}/ndbmgmsrv.lib" + "${CMAKE_CURRENT_BINARY_DIR}/common/logger/${CMAKE_CFG_INTDIR}/ndblogger.lib" + "${CMAKE_CURRENT_BINARY_DIR}/common/portlib/${CMAKE_CFG_INTDIR}/ndbportlib.lib" + "${CMAKE_CURRENT_BINARY_DIR}/common/util/${CMAKE_CFG_INTDIR}/ndbgeneral.lib") +ADD_DEPENDENCIES(ndbclient + ndbapi + ndbtransport + ndbtrace + ndbsignaldata + ndbmgmapi + ndbmgmsrv + ndblogger + ndbportlib + ndbgeneral) + +ELSE(WIN32) +ADD_LIBRARY(ndbclient SHARED dll.cpp) +TARGET_LINK_LIBRARIES(ndbclient + ndbapi + ndbtransport + ndbtrace + ndbsignaldata + ndbmgmapi + ndbmgmsrv + ndblogger + ndbportlib + ndbgeneral) +ENDIF(WIN32) --- a/ndb/src/common/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/common/CMakeLists.txt 2007-09-06 13:30:48 +0000 @@ -0,0 +1,23 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +ADD_SUBDIRECTORY(portlib) +ADD_SUBDIRECTORY(debugger) +ADD_SUBDIRECTORY(util) +ADD_SUBDIRECTORY(logger) +ADD_SUBDIRECTORY(transporter) +ADD_SUBDIRECTORY(mgmcommon) + --- a/ndb/src/common/debugger/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/common/debugger/CMakeLists.txt 2007-09-06 13:30:48 +0000 @@ -0,0 +1,27 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +ADD_SUBDIRECTORY(signaldata) + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbtrace STATIC + SignalLoggerManager.cpp + DebuggerNames.cpp + BlockNames.cpp + EventLogger.cpp + GrepError.cpp) + --- a/ndb/src/common/debugger/signaldata/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/common/debugger/signaldata/CMakeLists.txt 2007-09-06 13:30:48 +0000 @@ -0,0 +1,43 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapi.cmake) + +ADD_LIBRARY(ndbsignaldata STATIC + TcKeyReq.cpp TcKeyConf.cpp TcKeyRef.cpp + TcRollbackRep.cpp + TupKey.cpp TupCommit.cpp LqhKey.cpp + FsOpenReq.cpp FsCloseReq.cpp FsRef.cpp FsConf.cpp FsReadWriteReq.cpp + SignalDataPrint.cpp SignalNames.cpp + ContinueB.cpp DihContinueB.cpp NdbfsContinueB.cpp + CloseComReqConf.cpp PackedSignal.cpp PrepFailReqRef.cpp + GCPSave.cpp DictTabInfo.cpp + AlterTable.cpp AlterTab.cpp + CreateTrig.cpp AlterTrig.cpp DropTrig.cpp + FireTrigOrd.cpp TrigAttrInfo.cpp + CreateIndx.cpp AlterIndx.cpp DropIndx.cpp TcIndx.cpp + IndxKeyInfo.cpp IndxAttrInfo.cpp + FsAppendReq.cpp ScanTab.cpp + BackupImpl.cpp BackupSignalData.cpp + UtilSequence.cpp UtilPrepare.cpp UtilDelete.cpp UtilExecute.cpp + LqhFrag.cpp DropTab.cpp PrepDropTab.cpp LCP.cpp MasterLCP.cpp + CopyGCI.cpp SystemError.cpp StartRec.cpp NFCompleteRep.cpp + FailRep.cpp DisconnectRep.cpp SignalDroppedRep.cpp + SumaImpl.cpp NdbSttor.cpp CreateFragmentation.cpp + UtilLock.cpp TuxMaint.cpp AccLock.cpp + LqhTrans.cpp ReadNodesConf.cpp CntrStart.cpp + ScanFrag.cpp ) + --- a/ndb/src/common/logger/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/common/logger/CMakeLists.txt 2007-09-06 13:30:49 +0000 @@ -0,0 +1,24 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapi.cmake) + +ADD_LIBRARY(ndblogger STATIC + Logger.cpp + LogHandlerList.cpp + LogHandler.cpp + ConsoleLogHandler.cpp + FileLogHandler.cpp) --- a/ndb/src/common/mgmcommon/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/common/mgmcommon/CMakeLists.txt 2007-09-06 13:30:49 +0000 @@ -0,0 +1,25 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/src/mgmapi + ${CMAKE_SOURCE_DIR}/ndb/src/mgmsrv) +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapi.cmake) +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_mgmapiclient.cmake) + +ADD_LIBRARY(ndbmgmsrv STATIC + ConfigRetriever.cpp + IPCConfig.cpp) + --- a/ndb/src/common/portlib/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/common/portlib/CMakeLists.txt 2007-09-09 09:28:19 +0000 @@ -0,0 +1,44 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_BINARY_DIR}/ndb/config/type_util.cmake) + +IF(WIN32) +ADD_DEFINITIONS(-D_WIN32_WINNT=0x400) +ENDIF(WIN32) + +ADD_LIBRARY(ndbportlib STATIC + NdbCondition.c NdbMutex.c NdbSleep.c NdbTick.c + NdbEnv.c NdbThread.c NdbHost.c NdbTCP.cpp + NdbDaemon.c NdbMem.c + NdbConfig.c) + +# win32/NdbCondition.c win32/NdbDaemon.c win32/NdbEnv.c +# win32/NdbHost.c win32/NdbMem.c win32/NdbMutex.c +# win32/NdbSleep.c win32/NdbTCP.c win32/NdbThread.c +# win32/NdbTick.c) + +#ADD_EXECUTABLE(memtest memtest.c) +#TARGET_LINK_LIBRARIES(memtest ndbportlib wsock32) + +#ADD_EXECUTABLE(PortLibTest NdbPortLibTest.cpp) +#TARGET_LINK_LIBRARIES(PortLibTest ndbportlib wsock32) + +#ADD_EXECUTABLE(munmaptest munmaptest.cpp) +#TARGET_LINK_LIBRARIES(munmaptest ndbportlib wsock32) + +#ADD_DEFINITIONS(-DNDB_DAEMON_TEST) +#ADD_EXECUTABLE(ndbdaemon_test NdbDaemon.c) --- a/ndb/src/common/transporter/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/common/transporter/CMakeLists.txt 2007-09-06 13:30:49 +0000 @@ -0,0 +1,28 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_util.cmake) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/include/mgmapi + ${CMAKE_SOURCE_DIR}/ndb/src/mgmapi + ${CMAKE_SOURCE_DIR}/ndb/include/debugger + ${CMAKE_SOURCE_DIR}/ndb/include/kernel + ${CMAKE_SOURCE_DIR}/ndb/include/transporter + ${NDB_SCI_INCLUDES}) + +ADD_LIBRARY(ndbtransport STATIC + Transporter.cpp SendBuffer.cpp TCP_Transporter.cpp + TransporterRegistry.cpp Packer.cpp) + --- a/ndb/src/common/util/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/common/util/CMakeLists.txt 2007-09-06 13:30:49 +0000 @@ -0,0 +1,50 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR}/include + ${CMAKE_BINARY_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/include + ${CMAKE_SOURCE_DIR}/mysys + ${CMAKE_SOURCE_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/ndb/include/util + ${CMAKE_SOURCE_DIR}/ndb/include/portlib + ${CMAKE_SOURCE_DIR}/ndb/include/logger) + +ADD_LIBRARY(ndbgeneral STATIC + File.cpp + md5_hash.cpp + Properties.cpp + socket_io.cpp + SimpleProperties.cpp + Parser.cpp + InputStream.cpp + SocketServer.cpp + SocketClient.cpp + SocketAuthenticator.cpp + OutputStream.cpp + NdbOut.cpp + BaseString.cpp + NdbSqlUtil.cpp + new.cpp + uucode.c + random.c + version.c + strdup.c + ConfigValues.cpp + ndb_init.c + basestring_vsnprintf.c + Bitmask.cpp) --- a/ndb/src/kernel/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/CMakeLists.txt 2007-09-06 13:30:49 +0000 @@ -0,0 +1,75 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +ADD_SUBDIRECTORY(error) +ADD_SUBDIRECTORY(blocks) +ADD_SUBDIRECTORY(vm) + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/blocks/cmvmi + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbacc + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbdict + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbdih + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dblqh + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbtc + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbtup + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/ndbfs + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/ndbcntr + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/qmgr + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/trix + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/backup + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbutil + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/suma + ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbtux) + + +LINK_LIBRARIES(ndbcmvmi + ndbdbacc + ndbdbdict + ndbdbdih + ndbdblqh + ndbdbtc + ndbdbtup + ndbndbfs + ndbndbcntr + ndbqmgr + ndbtrix + ndbbackup + ndbdbutil + ndbsuma + ndbdbtux + ndbkernel + ndberror + ndbtransport + ndbtrace + ndbsignaldata + ndblogger + ndbmgmsrv + ndbmgmapi + ndbportlib + ndbgeneral + dbug + mysys + strings + ${NDB_SCI_LIBS}) +IF(WIN32) +LINK_LIBRARIES(wsock32) +ENDIF(WIN32) + +ADD_EXECUTABLE(ndbd + main.cpp + SimBlockList.cpp) --- a/ndb/src/kernel/blocks/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/CMakeLists.txt 2007-09-06 13:30:49 +0000 @@ -0,0 +1,32 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +ADD_SUBDIRECTORY(cmvmi) +ADD_SUBDIRECTORY(dbacc) +ADD_SUBDIRECTORY(dbdict) +ADD_SUBDIRECTORY(dbdih) +ADD_SUBDIRECTORY(dblqh) +ADD_SUBDIRECTORY(dbtc) +ADD_SUBDIRECTORY(dbtup) +ADD_SUBDIRECTORY(ndbfs) +ADD_SUBDIRECTORY(ndbcntr) +ADD_SUBDIRECTORY(qmgr) +ADD_SUBDIRECTORY(trix) +ADD_SUBDIRECTORY(backup) +ADD_SUBDIRECTORY(dbutil) +ADD_SUBDIRECTORY(suma) +ADD_SUBDIRECTORY(dbtux) + --- a/ndb/src/kernel/blocks/backup/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/backup/CMakeLists.txt 2007-09-06 13:30:49 +0000 @@ -0,0 +1,20 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbbackup STATIC + Backup.cpp BackupInit.cpp) --- a/ndb/src/kernel/blocks/cmvmi/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/cmvmi/CMakeLists.txt 2007-09-06 13:30:49 +0000 @@ -0,0 +1,20 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbcmvmi STATIC + Cmvmi.cpp) --- a/ndb/src/kernel/blocks/dbacc/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/dbacc/CMakeLists.txt 2007-09-06 13:30:49 +0000 @@ -0,0 +1,21 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/src/kernel/blocks/dbtup) +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbdbacc STATIC + DbaccInit.cpp DbaccMain.cpp) --- a/ndb/src/kernel/blocks/dbdict/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/dbdict/CMakeLists.txt 2007-09-06 13:30:49 +0000 @@ -0,0 +1,32 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +LINK_LIBRARIES(ndbgeneral + ndbportlib + dbug + mysys + strings) +IF(WIN32) +LINK_LIBRARIES(wsock32) +ENDIF(WIN32) + +ADD_LIBRARY(ndbdbdict STATIC + Dbdict.cpp) + +ADD_EXECUTABLE(printSchemaFile + printSchemaFile.cpp) --- a/ndb/src/kernel/blocks/dbdih/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/dbdih/CMakeLists.txt 2007-09-06 13:30:49 +0000 @@ -0,0 +1,30 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +LINK_LIBRARIES(ndbgeneral + ndbportlib) +IF(WIN32) +LINK_LIBRARIES(wsock32) +ENDIF(WIN32) + +ADD_LIBRARY(ndbdbdih STATIC + DbdihInit.cpp + DbdihMain.cpp) + +ADD_EXECUTABLE(ndbd_sysfile_reader + printSysfile/printSysfile.cpp) --- a/ndb/src/kernel/blocks/dblqh/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/dblqh/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,30 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +LINK_LIBRARIES(ndbgeneral + ndbportlib) +IF(WIN32) +LINK_LIBRARIES(wsock32) +ENDIF(WIN32) + +ADD_LIBRARY(ndbdblqh STATIC + DblqhInit.cpp DblqhMain.cpp) + +ADD_EXECUTABLE(ndbd_redo_log_reader + redoLogReader/records.cpp + redoLogReader/redoLogFileReader.cpp) --- a/ndb/src/kernel/blocks/dbtc/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/dbtc/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,21 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbdbtc + DbtcInit.cpp + DbtcMain.cpp) --- a/ndb/src/kernel/blocks/dbtup/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/dbtup/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,38 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbdbtup STATIC + DbtupExecQuery.cpp + DbtupBuffer.cpp + DbtupRoutines.cpp + DbtupCommit.cpp + DbtupFixAlloc.cpp + DbtupTrigger.cpp + DbtupAbort.cpp + DbtupLCP.cpp + DbtupUndoLog.cpp + DbtupPageMap.cpp + DbtupPagMan.cpp + DbtupStoredProcDef.cpp + DbtupMeta.cpp + DbtupTabDesMan.cpp + DbtupGen.cpp + DbtupSystemRestart.cpp + DbtupIndex.cpp + DbtupScan.cpp + DbtupDebug.cpp) --- a/ndb/src/kernel/blocks/dbtux/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/dbtux/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,30 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/src/kernel/blocks/dbtup) +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbdbtux STATIC + DbtuxGen.cpp + DbtuxMeta.cpp + DbtuxMaint.cpp + DbtuxNode.cpp + DbtuxTree.cpp + DbtuxScan.cpp + DbtuxSearch.cpp + DbtuxCmp.cpp + DbtuxDebug.cpp) + --- a/ndb/src/kernel/blocks/dbutil/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/dbutil/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,20 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbdbutil STATIC + DbUtil.cpp) --- a/ndb/src/kernel/blocks/ndbcntr/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/ndbcntr/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,22 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbndbcntr STATIC + NdbcntrInit.cpp + NdbcntrSysTable.cpp + NdbcntrMain.cpp) --- a/ndb/src/kernel/blocks/ndbfs/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/ndbfs/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,24 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbndbfs STATIC + AsyncFile.cpp + Ndbfs.cpp + VoidFs.cpp + Filename.cpp + CircularIndex.cpp) --- a/ndb/src/kernel/blocks/qmgr/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/qmgr/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,20 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbqmgr STATIC + QmgrInit.cpp QmgrMain.cpp) --- a/ndb/src/kernel/blocks/suma/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/suma/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,20 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbsuma STATIC + Suma.cpp SumaInit.cpp) --- a/ndb/src/kernel/blocks/trix/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/blocks/trix/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,20 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbtrix STATIC + Trix.cpp) --- a/ndb/src/kernel/error/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/error/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,22 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndberror STATIC + TimeModule.cpp + ErrorReporter.cpp + ndbd_exit_codes.c) --- a/ndb/src/kernel/vm/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/kernel/vm/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,35 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/src/mgmapi) +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake) + +ADD_LIBRARY(ndbkernel STATIC + SimulatedBlock.cpp + FastScheduler.cpp + TimeQueue.cpp + VMSignal.cpp + ThreadConfig.cpp + TransporterCallback.cpp + Emulator.cpp + Configuration.cpp + WatchDog.cpp + SimplePropertiesSection.cpp + SectionReader.cpp + MetaData.cpp + Mutex.cpp + SafeCounter.cpp + ndbd_malloc.cpp) --- a/ndb/src/mgmapi/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/mgmapi/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,25 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_util.cmake) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/include/mgmapi) + +ADD_LIBRARY(ndbmgmapi STATIC + mgmapi.cpp + ndb_logevent.cpp + mgmapi_configuration.cpp + LocalConfig.cpp + ${CMAKE_SOURCE_DIR}/ndb/src/kernel/error/ndbd_exit_codes.c) --- a/ndb/src/mgmclient/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/mgmclient/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,38 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapi.cmake) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/include/mgmapi + ${CMAKE_SOURCE_DIR}/ndb/src/common/mgmcommon) + +ADD_LIBRARY(ndbmgmclient STATIC + CommandInterpreter.cpp) + +LINK_LIBRARIES(ndbmgmclient + ndbmgmapi + ndblogger + ndbtrace + ndbportlib + ndbgeneral + dbug + mysys + strings) +IF(WIN32) +LINK_LIBRARIES(wsock32) +ENDIF(WIN32) + + +ADD_EXECUTABLE(ndb_mgm + main.cpp) --- a/ndb/src/mgmsrv/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/mgmsrv/CMakeLists.txt 2007-09-07 14:22:02 +0000 @@ -0,0 +1,47 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapi.cmake) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/src/ndbapi + ${CMAKE_SOURCE_DIR}/ndb/src/mgmapi + ${CMAKE_SOURCE_DIR}/ndb/src/common/mgmcommon + ${CMAKE_SOURCE_DIR}/ndb/src/mgmclient + ${CMAKE_SOURCE_DIR}/sql) + +LINK_LIBRARIES(ndbmgmclient + ndbclient + dbug + mysys + strings + ${NDB_SCI_LIBS}) +IF(WIN32) +LINK_LIBRARIES(wsock32) +ENDIF(WIN32) + + +ADD_EXECUTABLE(ndb_mgmd + MgmtSrvr.cpp + MgmtSrvrGeneralSignalHandling.cpp + main.cpp + Services.cpp + convertStrToInt.cpp + SignalQueue.cpp + MgmtSrvrConfig.cpp + ConfigInfo.cpp + InitConfigFileParser.cpp + Config.cpp + ${CMAKE_SOURCE_DIR}/sql/nt_servc.cc) + --- a/ndb/src/ndbapi/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/src/ndbapi/CMakeLists.txt 2007-09-06 13:30:50 +0000 @@ -0,0 +1,53 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapi.cmake) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/src/mgmapi) + +ADD_LIBRARY(ndbapi STATIC + TransporterFacade.cpp + ClusterMgr.cpp + Ndb.cpp + NdbPoolImpl.cpp + NdbPool.cpp + Ndblist.cpp + Ndbif.cpp + Ndbinit.cpp + Ndberr.cpp + ndberror.c + NdbErrorOut.cpp + NdbTransaction.cpp + NdbTransactionScan.cpp + NdbOperation.cpp + NdbOperationSearch.cpp + NdbOperationScan.cpp + NdbOperationInt.cpp + NdbOperationDefine.cpp + NdbOperationExec.cpp + NdbScanOperation.cpp + NdbScanFilter.cpp + NdbIndexOperation.cpp + NdbApiSignal.cpp + NdbRecAttr.cpp + NdbUtil.cpp + NdbReceiver.cpp + NdbDictionary.cpp + NdbDictionaryImpl.cpp + DictCache.cpp + ndb_cluster_connection.cpp + NdbBlob.cpp + SignalSender.cpp + ObjectMap.cpp) --- a/ndb/test/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/test/CMakeLists.txt 2007-09-06 13:30:52 +0000 @@ -0,0 +1,19 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +ADD_SUBDIRECTORY(src) +ADD_SUBDIRECTORY(tools) +ADD_SUBDIRECTORY(ndbapi) +ADD_SUBDIRECTORY(run-test) --- a/ndb/test/ndbapi/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/test/ndbapi/CMakeLists.txt 2007-09-06 13:30:52 +0000 @@ -0,0 +1,72 @@ +# Copyright (C) 2004-2006 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +ADD_SUBDIRECTORY(bank) + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapitest.cmake) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/include/kernel) + +ADD_EXECUTABLE(create_all_tabs create_all_tabs.cpp) +ADD_EXECUTABLE(create_tab create_tab.cpp) +ADD_EXECUTABLE(drop_all_tabs drop_all_tabs.cpp) +ADD_EXECUTABLE(flexAsynch flexAsynch.cpp) +ADD_EXECUTABLE(flexBench flexBench.cpp) +ADD_EXECUTABLE(flexHammer flexHammer.cpp) +ADD_EXECUTABLE(flexTT flexTT.cpp) +#flexTimedAsynch_SOURCES = flexTimedAsynch.cpp +#flex_bench_mysql_SOURCES = flex_bench_mysql.cpp +ADD_EXECUTABLE(testBackup testBackup.cpp) +ADD_EXECUTABLE(testBasic testBasic.cpp) +ADD_EXECUTABLE(testBasicAsynch testBasicAsynch.cpp) +#ADD_EXECUTABLE(testBlobs testBlobs.cpp) +ADD_EXECUTABLE(testDataBuffers testDataBuffers.cpp) +ADD_EXECUTABLE(testDict testDict.cpp) +ADD_EXECUTABLE(testIndex testIndex.cpp) +ADD_EXECUTABLE(testMgm testMgm.cpp) +ADD_EXECUTABLE(testNdbApi testNdbApi.cpp) +ADD_EXECUTABLE(testNodeRestart testNodeRestart.cpp) +ADD_DEPENDENCIES(testNodeRestart ndbclient) +ADD_EXECUTABLE(testOIBasic testOIBasic.cpp) +ADD_DEPENDENCIES(testOIBasic ndbclient) +ADD_EXECUTABLE(testOperations testOperations.cpp) +ADD_EXECUTABLE(testRestartGci testRestartGci.cpp) +ADD_EXECUTABLE(testScan testScan.cpp ScanFunctions.hpp) +ADD_EXECUTABLE(testInterpreter testInterpreter.cpp) +ADD_EXECUTABLE(testScanFilter testScanFilter.cpp) +ADD_EXECUTABLE(testScanInterpreter testScanInterpreter.cpp ScanFilter.hpp ScanInterpretTest.hpp ) +ADD_EXECUTABLE(testScanPerf testScanPerf.cpp) +ADD_EXECUTABLE(testSystemRestart testSystemRestart.cpp) +ADD_EXECUTABLE(testTimeout testTimeout.cpp) +ADD_EXECUTABLE(testTransactions testTransactions.cpp) +ADD_EXECUTABLE(testDeadlock testDeadlock.cpp) +#ADD_EXECUTABLE(test_event test_event.cpp) +ADD_EXECUTABLE(ndbapi_slow_select slow_select.cpp) +ADD_EXECUTABLE(testReadPerf testReadPerf.cpp) +ADD_EXECUTABLE(testLcp testLcp.cpp) +ADD_EXECUTABLE(testPartitioning testPartitioning.cpp) +ADD_EXECUTABLE(testBitfield testBitfield.cpp) +ADD_EXECUTABLE(DbCreate bench/mainPopulate.cpp bench/dbPopulate.cpp bench/userInterface.cpp bench/dbPopulate.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp) +ADD_EXECUTABLE(DbAsyncGenerator bench/mainAsyncGenerator.cpp bench/asyncGenerator.cpp bench/ndb_async2.cpp bench/dbGenerator.h bench/macros.h bench/userInterface.h bench/testData.h bench/testDefinitions.h bench/ndb_schema.hpp bench/ndb_error.hpp) +#ADD_EXECUTABLE(test_event_multi_table test_event_multi_table.cpp) +ADD_EXECUTABLE(testSRBank testSRBank.cpp) +#ADD_EXECUTABLE(test_event_merge test_event_merge.cpp) + +##testDict_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel +##testIndex_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel +##testSystemRestart_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel +##testTransactions_INCLUDES = $(INCLUDES) -I$(top_srcdir)/ndb/include/kernel +TARGET_LINK_LIBRARIES(testBackup ndbbank) +TARGET_LINK_LIBRARIES(testSRBank ndbbank) + --- a/ndb/test/ndbapi/bank/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/test/ndbapi/bank/CMakeLists.txt 2007-09-06 13:30:52 +0000 @@ -0,0 +1,34 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapitest.cmake) + +ADD_LIBRARY(ndbbank STATIC + Bank.cpp BankLoad.cpp) + +ADD_EXECUTABLE(testBank testBank.cpp) +TARGET_LINK_LIBRARIES(testBank ndbbank) +ADD_EXECUTABLE(bankSumAccounts bankSumAccounts.cpp) +TARGET_LINK_LIBRARIES(bankSumAccounts ndbbank) +ADD_EXECUTABLE(bankValidateAllGLs bankValidateAllGLs.cpp) +TARGET_LINK_LIBRARIES(bankValidateAllGLs ndbbank) +ADD_EXECUTABLE(bankMakeGL bankMakeGL.cpp) +TARGET_LINK_LIBRARIES(bankMakeGL ndbbank) +ADD_EXECUTABLE(bankTransactionMaker bankTransactionMaker.cpp) +TARGET_LINK_LIBRARIES(bankTransactionMaker ndbbank) +ADD_EXECUTABLE(bankCreator bankCreator.cpp) +TARGET_LINK_LIBRARIES(bankCreator ndbbank) +ADD_EXECUTABLE(bankTimer bankTimer.cpp) +TARGET_LINK_LIBRARIES(bankTimer ndbbank) --- a/ndb/test/ndbapi/old_dirs/flexBench/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/test/ndbapi/old_dirs/flexBench/CMakeLists.txt 2007-09-06 13:30:53 +0000 @@ -0,0 +1,21 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapitest.cmake) + +ADD_EXECUTABLE(flexBench + flexBench.cpp) + --- a/ndb/test/src/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/test/src/CMakeLists.txt 2007-09-06 13:30:53 +0000 @@ -0,0 +1,45 @@ +# Copyright (C) 2004 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/test/include + ${CMAKE_SOURCE_DIR}/ndb/src/common/mgmcommon + ${CMAKE_SOURCE_DIR}/ndb/include/mgmcommon + ${CMAKE_SOURCE_DIR}/ndb/include/kernel + ${CMAKE_SOURCE_DIR}/ndb/src/mgmapi) +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapitest.cmake) + +ADD_LIBRARY(ndbNDBT STATIC + NDBT_ReturnCodes.cpp + NDBT_Error.cpp + NDBT_Tables.cpp + NDBT_ResultRow.cpp + NDBT_Test.cpp + HugoCalculator.cpp + HugoOperations.cpp + HugoTransactions.cpp + HugoAsynchTransactions.cpp + UtilTransactions.cpp + NdbRestarter.cpp + NdbRestarts.cpp + NDBT_Output.cpp + NdbBackup.cpp + NdbConfig.cpp + NdbGrep.cpp + NDBT_Table.cpp + NdbSchemaCon.cpp + NdbSchemaOp.cpp + getarg.c + CpcClient.cpp) + --- a/ndb/test/tools/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/test/tools/CMakeLists.txt 2007-09-06 13:30:53 +0000 @@ -0,0 +1,36 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapitest.cmake) + +ADD_EXECUTABLE(hugoFill hugoFill.cpp) + +ADD_EXECUTABLE(hugoLoad hugoLoad.cpp) +ADD_EXECUTABLE(hugoLockRecords hugoLockRecords.cpp) +ADD_EXECUTABLE(hugoPkDelete hugoPkDelete.cpp) +ADD_EXECUTABLE(hugoPkRead hugoPkRead.cpp) +ADD_DEPENDENCIES(hugoPkRead ndbclient) +ADD_EXECUTABLE(hugoPkReadRecord hugoPkReadRecord.cpp) +ADD_DEPENDENCIES(hugoPkReadRecord ndbclient) +ADD_EXECUTABLE(hugoPkUpdate hugoPkUpdate.cpp) +ADD_EXECUTABLE(hugoScanRead hugoScanRead.cpp) +ADD_EXECUTABLE(hugoScanUpdate hugoScanUpdate.cpp) +ADD_EXECUTABLE(restart restart.cpp) +#ADD_EXECUTABLE(transproxy transproxy.cpp) +ADD_EXECUTABLE(verify_index verify_index.cpp) +ADD_EXECUTABLE(copy_tab copy_tab.cpp) +ADD_EXECUTABLE(create_index create_index.cpp) +ADD_EXECUTABLE(ndb_cpcc cpcc.cpp) --- a/ndb/tools/CMakeLists.txt 1970-01-01 00:00:00 +0000 +++ b/ndb/tools/CMakeLists.txt 2007-09-06 13:30:53 +0000 @@ -0,0 +1,70 @@ +# Copyright (C) 2007 MySQL AB +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + +INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapitools.cmake) + +SET(NDBTOOLS_COMMON_SOURCES + ${CMAKE_SOURCE_DIR}/ndb/test/src/NDBT_ReturnCodes.cpp + ${CMAKE_SOURCE_DIR}/ndb/test/src/NDBT_Table.cpp + ${CMAKE_SOURCE_DIR}/ndb/test/src/NDBT_Output.cpp) + +ADD_EXECUTABLE(ndb_test_platform + ndb_test_platform.cpp) +ADD_EXECUTABLE(ndb_waiter + waiter.cpp + ${NDBTOOLS_COMMON_SOURCES}) +ADD_EXECUTABLE(ndb_drop_table + drop_tab.cpp + ${NDBTOOLS_COMMON_SOURCES}) +ADD_EXECUTABLE(ndb_delete_all + delete_all.cpp + ${NDBTOOLS_COMMON_SOURCES}) +ADD_EXECUTABLE(ndb_desc + desc.cpp + ${NDBTOOLS_COMMON_SOURCES}) +ADD_EXECUTABLE(ndb_drop_index + drop_index.cpp + ${NDBTOOLS_COMMON_SOURCES}) +ADD_EXECUTABLE(ndb_show_tables + listTables.cpp + ${NDBTOOLS_COMMON_SOURCES}) +ADD_DEPENDENCIES(ndb_show_tables ndbclient) +ADD_EXECUTABLE(ndb_select_all + select_all.cpp + ${CMAKE_SOURCE_DIR}/ndb/test/src/NDBT_ResultRow.cpp + ${NDBTOOLS_COMMON_SOURCES}) +ADD_EXECUTABLE(ndb_select_count + select_count.cpp + ${NDBTOOLS_COMMON_SOURCES}) +ADD_EXECUTABLE(ndb_restore + restore/restore_main.cpp + restore/consumer.cpp + restore/consumer_restore.cpp + restore/consumer_printer.cpp + restore/Restore.cpp + ${CMAKE_SOURCE_DIR}/ndb/test/src/NDBT_ResultRow.cpp + ${NDBTOOLS_COMMON_SOURCES}) +ADD_EXECUTABLE(ndb_config + ndb_config.cpp + ${CMAKE_SOURCE_DIR}/ndb/src/mgmsrv/Config.cpp + ${CMAKE_SOURCE_DIR}/ndb/src/mgmsrv/ConfigInfo.cpp + ${CMAKE_SOURCE_DIR}/ndb/src/mgmsrv/InitConfigFileParser.cpp) +SET(options "-I${CMAKE_SOURCE_DIR}/ndb/src/mgmapi") +SET(options "${options} -I${CMAKE_SOURCE_DIR}/ndb/src/mgmsrv") +SET(options "${options} -I${CMAKE_SOURCE_DIR}/ndb/include/mgmcommon") +#SET(options "${options} -DMYSQLCLUSTERDIR=\"\\\"\\\"\"") +SET_TARGET_PROPERTIES(ndb_config PROPERTIES + COMPILE_FLAGS "${options}") --- a/CMakeLists.txt 2007-08-29 07:25:53 +0000 +++ b/CMakeLists.txt 2007-09-06 13:30:31 +0000 @@ -14,9 +14,12 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA PROJECT(MySql) +CMAKE_MINIMUM_REQUIRED(VERSION 2.4) + +INCLUDE(config.cmake) # This reads user configuration, generated by configure.js. -INCLUDE(win/configure.data) +INCLUDE(win/configure.data OPTIONAL) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY) @@ -54,6 +57,12 @@ ADD_DEFINITIONS(-DHAVE_INNOBASE_DB) ENDIF(WITH_INNOBASE_STORAGE_ENGINE) +IF(WITH_NDBCLUSTER_STORAGE_ENGINE) + ADD_DEFINITIONS(-DHAVE_NDBCLUSTER_DB) + ADD_DEFINITIONS(-DWITH_NDBCLUSTER_STORAGE_ENGINE) + SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_ndbcluster_plugin") +ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE) + 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) @@ -66,27 +75,46 @@ 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__) - # in some places we use DBUG_OFF SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF") SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DDBUG_OFF") SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF") -IF(CMAKE_GENERATOR MATCHES "Visual Studio 8") +################################################################# +### ADD_CXX_FLAGS(flags) ### +### flags will be added to CMAKE_CXX_FLAGS ### +################################################################# +MACRO(ADD_CXX_FLAGS) + FOREACH(arg ${ARGN}) + SET(TMP ${arg}) #elsewise the Seperate command doesn't work) + SEPARATE_ARGUMENTS(TMP) + FOREACH(option ${TMP}) + STRING(REGEX REPLACE " ${option}" "" CMAKE_CXX_FLAGS +"${CMAKE_CXX_FLAGS}") + STRING(REGEX REPLACE "${option}" "" CMAKE_CXX_FLAGS +"${CMAKE_CXX_FLAGS}") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${option}" CACHE STRING +"common C++ build flags" FORCE) + ENDFOREACH(option ${TMP}) + ENDFOREACH(arg ${ARGN}) +ENDMACRO(ADD_CXX_FLAGS) + +IF(WIN32) + IF(__NT__) + ADD_DEFINITIONS(-D__NT__) + ENDIF(__NT__) + 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_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /wd4996") SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /wd4996") SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /wd4996") SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /wd4996") -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8") + ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8") -IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR - CMAKE_GENERATOR MATCHES "Visual Studio 8") + IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR + CMAKE_GENERATOR MATCHES "Visual Studio 8") # replace /MDd with /MTd STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}) @@ -109,12 +137,12 @@ STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_INIT ${CMAKE_CXX_FLAGS_INIT}) STRING(REPLACE "/EHsc" "" CMAKE_CXX_FLAGS_DEBUG_INIT ${CMAKE_CXX_FLAGS_DEBUG_INIT}) -ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR + ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR CMAKE_GENERATOR MATCHES "Visual Studio 8") -ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE") + ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE") -IF(EMBED_MANIFESTS) + IF(EMBED_MANIFESTS) # Search for the tools (mt, makecat, signtool) necessary for embedding # manifests and signing executables with the MySQL AB authenticode cert. # @@ -170,7 +198,8 @@ ELSE(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") SET(PROCESSOR_ARCH "X86") ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 8 2005 Win64") -ENDIF(EMBED_MANIFESTS) + ENDIF(EMBED_MANIFESTS) +ENDIF(WIN32) # FIXME "debug" only needed if build type is "Debug", but # CMAKE_BUILD_TYPE is not set during configure time. @@ -194,6 +223,9 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) ADD_SUBDIRECTORY(innobase) ENDIF(WITH_INNOBASE_STORAGE_ENGINE) +IF(WITH_NDBCLUSTER_STORAGE_ENGINE) + ADD_SUBDIRECTORY(ndb) +ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE) ADD_SUBDIRECTORY(sql) ADD_SUBDIRECTORY(sql/examples) ADD_SUBDIRECTORY(server-tools/instance-manager) --- a/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/Makefile.am 2007-09-06 13:30:31 +0000 @@ -19,7 +19,8 @@ # These are built from source in the Docs directory EXTRA_DIST = INSTALL-SOURCE INSTALL-WIN-SOURCE \ - README COPYING EXCEPTIONS-CLIENT CMakeLists.txt + README COPYING EXCEPTIONS-CLIENT CMakeLists.txt \ + config.cmake SUBDIRS = . include @docs_dirs@ @zlib_dir@ @yassl_dir@ \ @readline_topdir@ sql-common scripts \ --- a/client/CMakeLists.txt 2007-08-29 07:25:53 +0000 +++ b/client/CMakeLists.txt 2007-09-08 01:38:44 +0000 @@ -32,6 +32,7 @@ ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc ../mysys/my_conio.c) TARGET_LINK_LIBRARIES(mysql mysqlclient_notls wsock32) +ADD_DEFINITIONS(-DUSE_CYGWIN) ADD_EXECUTABLE(mysqltest mysqltest.c ../mysys/my_getsystime.c ../mysys/my_copy.c) TARGET_LINK_LIBRARIES(mysqltest mysqlclient_notls regex wsock32) --- a/extra/CMakeLists.txt 2007-08-29 07:25:53 +0000 +++ b/extra/CMakeLists.txt 2007-09-06 13:30:36 +0000 @@ -18,6 +18,11 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) +IF(WITH_NDBCLUSTER_STORAGE_ENGINE) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi + ${CMAKE_SOURCE_DIR}/ndb/include/mgmapi) +ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE) ADD_EXECUTABLE(comp_err comp_err.c) TARGET_LINK_LIBRARIES(comp_err debug dbug mysys strings zlib wsock32) --- a/extra/yassl/taocrypt/taocrypt.vcproj 2007-08-29 07:25:53 +0000 +++ b/extra/yassl/taocrypt/taocrypt.vcproj 2007-09-09 07:40:59 +0000 @@ -1,268 +1,422 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- a/extra/yassl/yassl.vcproj 2007-08-29 07:25:53 +0000 +++ b/extra/yassl/yassl.vcproj 2007-09-09 07:40:59 +0000 @@ -1,211 +1,322 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- a/ndb/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/Makefile.am 2007-09-06 13:30:48 +0000 @@ -15,7 +15,7 @@ SUBDIRS = src tools . include @ndb_opt_subdirs@ DIST_SUBDIRS = src tools include test docs -EXTRA_DIST = config ndbapi-examples +EXTRA_DIST = config ndbapi-examples CMakeLists.txt include $(top_srcdir)/ndb/config/common.mk.am --- a/ndb/include/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/include/Makefile.am 2007-09-06 13:30:48 +0000 @@ -54,7 +54,7 @@ ndb_net.h EXTRA_DIST = debugger editline kernel logger mgmcommon \ -portlib transporter util +portlib transporter util CMakeLists.txt dist-hook: -rm -rf `find $(distdir) -type d -name SCCS` --- a/ndb/src/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/Makefile.am 2007-09-06 13:30:48 +0000 @@ -14,6 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA SUBDIRS = common mgmapi ndbapi . kernel mgmclient mgmsrv cw +EXTRA_DIST = CMakeLists.txt include $(top_srcdir)/ndb/config/common.mk.am --- a/ndb/src/common/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/common/Makefile.am 2007-09-06 13:30:48 +0000 @@ -14,6 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA SUBDIRS = portlib debugger util logger transporter mgmcommon +EXTRA_DIST = CMakeLists.txt noinst_LTLIBRARIES = libcommon.la --- a/ndb/src/common/debugger/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/common/debugger/Makefile.am 2007-09-06 13:30:48 +0000 @@ -14,6 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA SUBDIRS = signaldata +EXTRA_DIST = CMakeLists.txt noinst_LTLIBRARIES = libtrace.la --- a/ndb/src/common/debugger/signaldata/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/common/debugger/signaldata/Makefile.am 2007-09-06 13:30:49 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LTLIBRARIES = libsignaldataprint.la libsignaldataprint_la_SOURCES = \ --- a/ndb/src/common/logger/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/common/logger/Makefile.am 2007-09-06 13:30:49 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LTLIBRARIES = liblogger.la SOURCE_WIN = Logger.cpp LogHandlerList.cpp LogHandler.cpp \ --- a/ndb/src/common/mgmcommon/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/common/mgmcommon/Makefile.am 2007-09-06 13:30:49 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LTLIBRARIES = libmgmsrvcommon.la libmgmsrvcommon_la_SOURCES = \ --- a/ndb/src/common/portlib/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/common/portlib/Makefile.am 2007-09-06 13:30:49 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LTLIBRARIES = libportlib.la libportlib_la_SOURCES = \ --- a/ndb/src/common/transporter/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/common/transporter/Makefile.am 2007-09-06 13:30:49 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LTLIBRARIES = libtransporter.la libtransporter_la_SOURCES = \ --- a/ndb/src/common/util/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/common/util/Makefile.am 2007-09-06 13:30:49 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LTLIBRARIES = libgeneral.la libgeneral_la_SOURCES = \ --- a/ndb/src/kernel/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/Makefile.am 2007-09-06 13:30:49 +0000 @@ -14,6 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA SUBDIRS = error blocks vm +EXTRA_DIST = CMakeLists.txt include $(top_srcdir)/ndb/config/common.mk.am --- a/ndb/src/kernel/blocks/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/Makefile.am 2007-09-06 13:30:49 +0000 @@ -30,6 +30,8 @@ suma \ dbtux +EXTRA_DIST = CMakeLists.txt + windoze-dsp: # Don't update the files from bitkeeper --- a/ndb/src/kernel/blocks/backup/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/backup/Makefile.am 2007-09-06 13:30:49 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libbackup.a libbackup_a_SOURCES = Backup.cpp BackupInit.cpp --- a/ndb/src/kernel/blocks/cmvmi/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/cmvmi/Makefile.am 2007-09-06 13:30:49 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libcmvmi.a libcmvmi_a_SOURCES = Cmvmi.cpp --- a/ndb/src/kernel/blocks/dbacc/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/dbacc/Makefile.am 2007-09-06 13:30:49 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libdbacc.a libdbacc_a_SOURCES = DbaccInit.cpp DbaccMain.cpp --- a/ndb/src/kernel/blocks/dbdict/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/dbdict/Makefile.am 2007-09-06 13:30:49 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libdbdict.a EXTRA_PROGRAMS = printSchemaFile --- a/ndb/src/kernel/blocks/dbdih/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/dbdih/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libdbdih.a EXTRA_PROGRAMS = ndbd_sysfile_reader --- a/ndb/src/kernel/blocks/dblqh/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/dblqh/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libdblqh.a EXTRA_PROGRAMS = ndbd_redo_log_reader --- a/ndb/src/kernel/blocks/dbtc/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/dbtc/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libdbtc.a libdbtc_a_SOURCES = DbtcInit.cpp DbtcMain.cpp --- a/ndb/src/kernel/blocks/dbtup/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/dbtup/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libdbtup.a libdbtup_a_SOURCES = \ --- a/ndb/src/kernel/blocks/dbtux/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/dbtux/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libdbtux.a libdbtux_a_SOURCES = \ --- a/ndb/src/kernel/blocks/dbutil/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/dbutil/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libdbutil.a libdbutil_a_SOURCES = DbUtil.cpp --- a/ndb/src/kernel/blocks/ndbcntr/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/ndbcntr/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libndbcntr.a libndbcntr_a_SOURCES = \ --- a/ndb/src/kernel/blocks/ndbfs/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/ndbfs/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libndbfs.a libndbfs_a_SOURCES = \ --- a/ndb/src/kernel/blocks/qmgr/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/qmgr/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libqmgr.a libqmgr_a_SOURCES = \ --- a/ndb/src/kernel/blocks/suma/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/suma/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libsuma.a libsuma_a_SOURCES = Suma.cpp SumaInit.cpp --- a/ndb/src/kernel/blocks/trix/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/blocks/trix/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libtrix.a libtrix_a_SOURCES = Trix.cpp --- a/ndb/src/kernel/error/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/error/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = liberror.a liberror_a_SOURCES = TimeModule.cpp \ --- a/ndb/src/kernel/vm/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/kernel/vm/Makefile.am 2007-09-06 13:30:50 +0000 @@ -17,6 +17,7 @@ #ifneq ($(USE_EDITLINE), N) #DIRS += testLongSig #endif +EXTRA_DIST = CMakeLists.txt noinst_LIBRARIES = libkernel.a --- a/ndb/src/mgmapi/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/mgmapi/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LTLIBRARIES = libmgmapi.la libmgmapi_la_SOURCES = mgmapi.cpp ndb_logevent.cpp mgmapi_configuration.cpp LocalConfig.cpp ../kernel/error/ndbd_exit_codes.c --- a/ndb/src/mgmclient/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/mgmclient/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LTLIBRARIES = libndbmgmclient.la ndbtools_PROGRAMS = ndb_mgm --- a/ndb/src/mgmsrv/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/mgmsrv/Makefile.am 2007-09-06 13:30:50 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) --- a/ndb/src/ndbapi/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/src/ndbapi/Makefile.am 2007-09-06 13:30:50 +0000 @@ -14,6 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #SUBDIRS = signal-sender +EXTRA_DIST = CMakeLists.txt noinst_LTLIBRARIES = libndbapi.la --- a/ndb/test/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/test/Makefile.am 2007-09-06 13:30:52 +0000 @@ -15,7 +15,7 @@ SUBDIRS = src tools ndbapi run-test -EXTRA_DIST = include +EXTRA_DIST = include CMakeLists.txt dist-hook: -rm -rf `find $(distdir) -type d -name SCCS` --- a/ndb/test/ndbapi/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/test/ndbapi/Makefile.am 2007-09-06 13:30:52 +0000 @@ -14,6 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA SUBDIRS = bank +EXTRA_DIST = CMakeLists.txt ndbtest_PROGRAMS = \ flexBench \ --- a/ndb/test/ndbapi/bank/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/test/ndbapi/bank/Makefile.am 2007-09-06 13:30:52 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + ndbtest_PROGRAMS = testBank bankSumAccounts bankValidateAllGLs bankMakeGL bankTransactionMaker bankCreator bankTimer noinst_LIBRARIES = libbank.a --- a/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/test/ndbapi/old_dirs/flexBench/Makefile.am 2007-09-06 13:30:53 +0000 @@ -1,4 +1,6 @@ +EXTRA_DIST = CMakeLists.txt + bin_PROGRAMS = flexBench flexBench_SOURCES = flexBench.cpp --- a/ndb/test/src/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/test/src/Makefile.am 2007-09-06 13:30:53 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + noinst_LIBRARIES = libNDBT.a libNDBT_a_SOURCES = \ --- a/ndb/test/tools/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/test/tools/Makefile.am 2007-09-06 13:30:53 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + ndbtest_PROGRAMS = hugoLoad hugoFill hugoLockRecords hugoPkDelete hugoPkRead hugoPkReadRecord hugoPkUpdate hugoScanRead hugoScanUpdate restart verify_index copy_tab create_index ndb_cpcc # transproxy --- a/ndb/tools/Makefile.am 2007-08-29 07:25:53 +0000 +++ b/ndb/tools/Makefile.am 2007-09-06 13:30:53 +0000 @@ -13,6 +13,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +EXTRA_DIST = CMakeLists.txt + dist_bin_SCRIPTS = ndb_size.pl ndb_error_reporter dist_pkgdata_DATA = ndb_size.tmpl --- a/server-tools/instance-manager/mysqlmanager.vcproj 2007-08-29 07:25:53 +0000 +++ b/server-tools/instance-manager/mysqlmanager.vcproj 2007-09-09 07:41:34 +0000 @@ -1,382 +1,579 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- a/sql/CMakeLists.txt 2007-08-29 07:25:53 +0000 +++ b/sql/CMakeLists.txt 2007-09-06 13:30:54 +0000 @@ -41,6 +41,13 @@ ADD_DEFINITIONS(-DHAVE_INNOBASE -DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN) + +IF(WITH_NDBCLUSTER_STORAGE_ENGINE) + INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/ndb/include + ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi) +ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE) + IF(DISABLE_GRANT_OPTIONS) ADD_DEFINITIONS(-DDISABLE_GRANT_OPTIONS) @@ -52,6 +59,7 @@ filesort.cc gstream.cc ha_blackhole.cc ha_archive.cc ha_heap.cc ha_myisam.cc ha_myisammrg.cc ha_innodb.cc ha_federated.cc ha_berkeley.cc + ha_ndbcluster.cc ha_ndbcluster_cond.cc 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 @@ -99,6 +107,10 @@ TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} innobase) ENDIF(WITH_INNOBASE_STORAGE_ENGINE) +IF(WITH_NDBCLUSTER_STORAGE_ENGINE) + TARGET_LINK_LIBRARIES(mysqld ndbclient) +ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE) + IF(WITH_BERKELEY_STORAGE_ENGINE) TARGET_LINK_LIBRARIES(mysqld${MYSQLD_EXE_SUFFIX} bdb) ENDIF(WITH_BERKELEY_STORAGE_ENGINE) @@ -145,4 +157,4 @@ ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def) ADD_DEPENDENCIES(udf_example strings) -TARGET_LINK_LIBRARIES(udf_example wsock32) +TARGET_LINK_LIBRARIES(udf_example strings wsock32) --- a/win/configure.js 2007-08-29 07:25:53 +0000 +++ b/win/configure.js 2007-09-06 13:30:59 +0000 @@ -1,182 +1,181 @@ -// Configure.js -// -// Copyright (C) 2006 MySQL AB -// -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -ForReading = 1; -ForWriting = 2; -ForAppending = 8; - -try -{ - var fso = new ActiveXObject("Scripting.FileSystemObject"); - - var args = WScript.Arguments - - // read in the Unix configure.in file - var configureInTS = fso.OpenTextFile("configure.in", ForReading); - var configureIn = configureInTS.ReadAll(); - configureInTS.Close(); - var default_comment = "Source distribution"; - var default_port = GetValue(configureIn, "MYSQL_TCP_PORT_DEFAULT"); - - var configfile = fso.CreateTextFile("win\\configure.data", true); - for (i=0; i < args.Count(); 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 "__NT__": - case "DISABLE_GRANT_OPTIONS": - case "EMBED_MANIFESTS": - configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); - break; - case "MYSQL_SERVER_SUFFIX": - case "MYSQLD_EXE_SUFFIX": - configfile.WriteLine("SET (" + parts[0] + " \"" - + parts[1] + "\")"); - break; - case "COMPILATION_COMMENT": - default_comment = parts[1]; - break; - case "MYSQL_TCP_PORT": - default_port = parts[1]; - break; - } - } - - configfile.WriteLine("SET (COMPILATION_COMMENT \"" + - default_comment + "\")"); - - configfile.WriteLine("SET (PROTOCOL_VERSION \"" + - GetValue(configureIn, "PROTOCOL_VERSION") + "\")"); - configfile.WriteLine("SET (DOT_FRM_VERSION \"" + - GetValue(configureIn, "DOT_FRM_VERSION") + "\")"); - configfile.WriteLine("SET (MYSQL_TCP_PORT \"" + default_port + "\")"); - configfile.WriteLine("SET (MYSQL_UNIX_ADDR \"" + - GetValue(configureIn, "MYSQL_UNIX_ADDR_DEFAULT") + "\")"); - var version = GetVersion(configureIn); - configfile.WriteLine("SET (VERSION \"" + version + "\")"); - configfile.WriteLine("SET (MYSQL_BASE_VERSION \"" + - GetBaseVersion(version) + "\")"); - configfile.WriteLine("SET (MYSQL_VERSION_ID \"" + - GetVersionId(version) + "\")"); - - configfile.Close(); - - //ConfigureBDB(); - - fso = null; - - WScript.Echo("done!"); -} -catch (e) -{ - WScript.Echo("Error: " + e.description); -} - -function GetValue(str, key) -{ - var pos = str.indexOf(key+'='); - if (pos == -1) return null; - pos += key.length + 1; - var end = str.indexOf("\n", pos); - if (str.charAt(pos) == "\"") - pos++; - if (str.charAt(end-1) == "\"") - end--; - return str.substring(pos, end); -} - -function GetVersion(str) -{ - var key = "AM_INIT_AUTOMAKE(mysql, "; - var pos = str.indexOf(key); //5.0.6-beta) - if (pos == -1) return null; - pos += key.length; - var end = str.indexOf(")", pos); - if (end == -1) return null; - return str.substring(pos, end); -} - -function GetBaseVersion(version) -{ - var dot = version.indexOf("."); - if (dot == -1) return null; - dot = version.indexOf(".", dot+1); - if (dot == -1) dot = version.length; - return version.substring(0, dot); -} - -function GetVersionId(version) -{ - var dot = version.indexOf("."); - if (dot == -1) return null; - var major = parseInt(version.substring(0, dot), 10); - - dot++; - var nextdot = version.indexOf(".", dot); - if (nextdot == -1) return null; - var minor = parseInt(version.substring(dot, nextdot), 10); - dot = nextdot+1; - - var stop = version.indexOf("-", dot); - if (stop == -1) stop = version.length; - var build = parseInt(version.substring(dot, stop), 10); - - var id = major; - if (minor < 10) - id += '0'; - id += minor; - if (build < 10) - id += '0'; - id += build; - return id; -} - -function ConfigureBDB() -{ - // read in the Unix configure.in file - var dbIncTS = fso.OpenTextFile("..\\bdb\\dbinc\\db.in", ForReading); - var dbIn = dbIncTS.ReadAll(); - dbIncTS.Close(); - - dbIn = dbIn.replace("@DB_VERSION_MAJOR@", "$DB_VERSION_MAJOR"); - dbIn = dbIn.replace("@DB_VERSION_MINOR@", "$DB_VERSION_MINOR"); - dbIn = dbIn.replace("@DB_VERSION_PATCH@", "$DB_VERSION_PATCH"); - dbIn = dbIn.replace("@DB_VERSION_STRING@", "$DB_VERSION_STRING"); - - dbIn = dbIn.replace("@u_int8_decl@", "typedef unsigned char u_int8_t;"); - dbIn = dbIn.replace("@int16_decl@", "typedef short int16_t;"); - dbIn = dbIn.replace("@u_int16_decl@", "typedef unsigned short u_int16_t;"); - dbIn = dbIn.replace("@int32_decl@", "typedef int int32_t;"); - dbIn = dbIn.replace("@u_int32_decl@", "typedef unsigned int u_int32_t;"); - - dbIn = dbIn.replace("@u_char_decl@", "{\r\n#if !defined(_WINSOCKAPI_)\r\n" + - "typedef unsigned char u_char;"); - dbIn = dbIn.replace("@u_short_decl@", "typedef unsigned short u_short;"); - dbIn = dbIn.replace("@u_int_decl@", "typedef unsigned int u_int;"); - dbIn = dbIn.replace("@u_long_decl@", "typedef unsigned long u_long;"); - - dbIn = dbIn.replace("@ssize_t_decl@", "#endif\r\n#if defined(_WIN64)\r\n" + - "typedef __int64 ssize_t;\r\n#else\r\n" + - "typedef int ssize_t;\r\n#endif"); -} +// Configure.js +// +// Copyright (C) 2006 MySQL AB +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; version 2 of the License. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +ForReading = 1; +ForWriting = 2; +ForAppending = 8; + +try +{ + var fso = new ActiveXObject("Scripting.FileSystemObject"); + + var args = WScript.Arguments + + // read in the Unix configure.in file + var configureInTS = fso.OpenTextFile("configure.in", ForReading); + var configureIn = configureInTS.ReadAll(); + configureInTS.Close(); + var default_comment = "Source distribution"; + var default_port = GetValue(configureIn, "MYSQL_TCP_PORT_DEFAULT"); + + var configfile = fso.CreateTextFile("win\\configure.data", true); + for (i=0; i < args.Count(); 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_NDBCLUSTER_STORAGE_ENGINE": + case "__NT__": + case "DISABLE_GRANT_OPTIONS": + case "EMBED_MANIFESTS": + configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); + break; + case "MYSQL_SERVER_SUFFIX": + case "MYSQLD_EXE_SUFFIX": + configfile.WriteLine("SET (" + parts[0] + " \"" + + parts[1] + "\")"); + break; + case "COMPILATION_COMMENT": + default_comment = parts[1]; + break; + case "MYSQL_TCP_PORT": + default_port = parts[1]; + break; + } + } + + configfile.WriteLine("SET (COMPILATION_COMMENT \"" + + default_comment + "\")"); + + configfile.WriteLine("SET (PROTOCOL_VERSION \"" + + GetValue(configureIn, "PROTOCOL_VERSION") + "\")"); + configfile.WriteLine("SET (DOT_FRM_VERSION \"" + + GetValue(configureIn, "DOT_FRM_VERSION") + "\")"); + configfile.WriteLine("SET (MYSQL_TCP_PORT \"" + default_port + "\")"); + configfile.WriteLine("SET (MYSQL_UNIX_ADDR \"" + + GetValue(configureIn, "MYSQL_UNIX_ADDR_DEFAULT") + "\")"); + var version = GetVersion(configureIn); + configfile.WriteLine("SET (VERSION \"" + version + "\")"); + configfile.WriteLine("SET (MYSQL_BASE_VERSION \"" + + GetBaseVersion(version) + "\")"); + configfile.WriteLine("SET (MYSQL_VERSION_ID \"" + + GetVersionId(version) + "\")"); + + configfile.Close(); + + //ConfigureBDB(); + + fso = null; +} +catch (e) +{ + WScript.Echo("Error: " + e.description); +} + +function GetValue(str, key) +{ + var pos = str.indexOf(key+'='); + if (pos == -1) return null; + pos += key.length + 1; + var end = str.indexOf("\n", pos); + if (str.charAt(pos) == "\"") + pos++; + if (str.charAt(end-1) == "\"") + end--; + return str.substring(pos, end); +} + +function GetVersion(str) +{ + var key = "AM_INIT_AUTOMAKE(mysql, "; + var pos = str.indexOf(key); //5.0.6-beta) + if (pos == -1) return null; + pos += key.length; + var end = str.indexOf(")", pos); + if (end == -1) return null; + return str.substring(pos, end); +} + +function GetBaseVersion(version) +{ + var dot = version.indexOf("."); + if (dot == -1) return null; + dot = version.indexOf(".", dot+1); + if (dot == -1) dot = version.length; + return version.substring(0, dot); +} + +function GetVersionId(version) +{ + var dot = version.indexOf("."); + if (dot == -1) return null; + var major = parseInt(version.substring(0, dot), 10); + + dot++; + var nextdot = version.indexOf(".", dot); + if (nextdot == -1) return null; + var minor = parseInt(version.substring(dot, nextdot), 10); + dot = nextdot+1; + + var stop = version.indexOf("-", dot); + if (stop == -1) stop = version.length; + var build = parseInt(version.substring(dot, stop), 10); + + var id = major; + if (minor < 10) + id += '0'; + id += minor; + if (build < 10) + id += '0'; + id += build; + return id; +} + +function ConfigureBDB() +{ + // read in the Unix configure.in file + var dbIncTS = fso.OpenTextFile("..\\bdb\\dbinc\\db.in", ForReading); + var dbIn = dbIncTS.ReadAll(); + dbIncTS.Close(); + + dbIn = dbIn.replace("@DB_VERSION_MAJOR@", "$DB_VERSION_MAJOR"); + dbIn = dbIn.replace("@DB_VERSION_MINOR@", "$DB_VERSION_MINOR"); + dbIn = dbIn.replace("@DB_VERSION_PATCH@", "$DB_VERSION_PATCH"); + dbIn = dbIn.replace("@DB_VERSION_STRING@", "$DB_VERSION_STRING"); + + dbIn = dbIn.replace("@u_int8_decl@", "typedef unsigned char u_int8_t;"); + dbIn = dbIn.replace("@int16_decl@", "typedef short int16_t;"); + dbIn = dbIn.replace("@u_int16_decl@", "typedef unsigned short u_int16_t;"); + dbIn = dbIn.replace("@int32_decl@", "typedef int int32_t;"); + dbIn = dbIn.replace("@u_int32_decl@", "typedef unsigned int u_int32_t;"); + + dbIn = dbIn.replace("@u_char_decl@", "{\r\n#if !defined(_WINSOCKAPI_)\r\n" + + "typedef unsigned char u_char;"); + dbIn = dbIn.replace("@u_short_decl@", "typedef unsigned short u_short;"); + dbIn = dbIn.replace("@u_int_decl@", "typedef unsigned int u_int;"); + dbIn = dbIn.replace("@u_long_decl@", "typedef unsigned long u_long;"); + + dbIn = dbIn.replace("@ssize_t_decl@", "#endif\r\n#if defined(_WIN64)\r\n" + + "typedef __int64 ssize_t;\r\n#else\r\n" + + "typedef int ssize_t;\r\n#endif"); +}