| List: | Commits | « Previous MessageNext Message » | |
| From: | Stewart Smith | Date: | August 20 2008 3:25pm |
| Subject: | bzr push into mysql-5.1 branch (stewart:2717 to 2719) | ||
| View as plain text | |||
2719 stewart@stripped 2008-08-20
[patch 02/64] WL4012 WL1744 (ndb on win32): further cmake fixes for ndb on
win32Index: 7/CMakeLists.txt
===================================================================
modified:
CMakeLists.txt
client/CMakeLists.txt
storage/ndb/src/CMakeLists.txt
storage/ndb/src/common/portlib/CMakeLists.txt
storage/ndb/src/common/util/CMakeLists.txt
storage/ndb/src/kernel/CMakeLists.txt
storage/ndb/src/mgmapi/CMakeLists.txt
storage/ndb/src/mgmsrv/CMakeLists.txt
storage/ndb/test/tools/CMakeLists.txt
storage/ndb/tools/CMakeLists.txt
2718 stewart@stripped 2008-08-20
[patch 01/64] WL#4012 and WL#1744 NDB CMake build files for win32 portGiant patch of
CMakeLists.txt for building NDB, some Makefile.am changes to
make sure 'make dist' still works.
added:
config.cmake
storage/ndb/CMakeLists.txt
storage/ndb/config/type_kernel.cmake
storage/ndb/config/type_mgmapiclient.cmake
storage/ndb/config/type_ndbapi.cmake
storage/ndb/config/type_ndbapiclient.cmake
storage/ndb/config/type_ndbapitest.cmake
storage/ndb/config/type_ndbapitools.cmake
storage/ndb/config/type_util.cmake
storage/ndb/include/CMakeLists.txt
storage/ndb/src/CMakeLists.txt
storage/ndb/src/common/CMakeLists.txt
storage/ndb/src/common/debugger/CMakeLists.txt
storage/ndb/src/common/debugger/signaldata/CMakeLists.txt
storage/ndb/src/common/logger/CMakeLists.txt
storage/ndb/src/common/mgmcommon/CMakeLists.txt
storage/ndb/src/common/portlib/CMakeLists.txt
storage/ndb/src/common/transporter/CMakeLists.txt
storage/ndb/src/common/util/CMakeLists.txt
storage/ndb/src/kernel/CMakeLists.txt
storage/ndb/src/kernel/blocks/CMakeLists.txt
storage/ndb/src/kernel/blocks/backup/CMakeLists.txt
storage/ndb/src/kernel/blocks/cmvmi/CMakeLists.txt
storage/ndb/src/kernel/blocks/dbacc/CMakeLists.txt
storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt
storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt
storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt
storage/ndb/src/kernel/blocks/dbtc/CMakeLists.txt
storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt
storage/ndb/src/kernel/blocks/dbtux/CMakeLists.txt
storage/ndb/src/kernel/blocks/dbutil/CMakeLists.txt
storage/ndb/src/kernel/blocks/ndbcntr/CMakeLists.txt
storage/ndb/src/kernel/blocks/ndbfs/CMakeLists.txt
storage/ndb/src/kernel/blocks/qmgr/CMakeLists.txt
storage/ndb/src/kernel/blocks/suma/CMakeLists.txt
storage/ndb/src/kernel/blocks/trix/CMakeLists.txt
storage/ndb/src/kernel/error/CMakeLists.txt
storage/ndb/src/kernel/vm/CMakeLists.txt
storage/ndb/src/mgmapi/CMakeLists.txt
storage/ndb/src/mgmclient/CMakeLists.txt
storage/ndb/src/mgmsrv/CMakeLists.txt
storage/ndb/src/ndbapi/CMakeLists.txt
storage/ndb/test/CMakeLists.txt
storage/ndb/test/ndbapi/CMakeLists.txt
storage/ndb/test/ndbapi/bank/CMakeLists.txt
storage/ndb/test/src/CMakeLists.txt
storage/ndb/test/tools/CMakeLists.txt
storage/ndb/tools/CMakeLists.txt
modified:
CMakeLists.txt
Makefile.am
extra/CMakeLists.txt
mysys/CMakeLists.txt
sql/CMakeLists.txt
storage/ndb/Makefile.am
storage/ndb/include/Makefile.am
storage/ndb/src/Makefile.am
storage/ndb/src/common/Makefile.am
storage/ndb/src/common/debugger/Makefile.am
storage/ndb/src/common/debugger/signaldata/Makefile.am
storage/ndb/src/common/logger/Makefile.am
storage/ndb/src/common/mgmcommon/Makefile.am
storage/ndb/src/common/portlib/Makefile.am
storage/ndb/src/common/transporter/Makefile.am
storage/ndb/src/common/util/Makefile.am
storage/ndb/src/kernel/Makefile.am
storage/ndb/src/kernel/blocks/Makefile.am
storage/ndb/src/kernel/blocks/backup/Makefile.am
storage/ndb/src/kernel/blocks/dbdict/Makefile.am
storage/ndb/src/kernel/blocks/dbdih/Makefile.am
storage/ndb/src/kernel/blocks/dblqh/Makefile.am
storage/ndb/src/kernel/blocks/dbtup/Makefile.am
storage/ndb/src/kernel/error/Makefile.am
storage/ndb/src/kernel/vm/Makefile.am
storage/ndb/src/mgmapi/Makefile.am
storage/ndb/src/mgmclient/Makefile.am
storage/ndb/src/mgmsrv/Makefile.am
storage/ndb/src/ndbapi/Makefile.am
storage/ndb/test/Makefile.am
storage/ndb/test/ndbapi/Makefile.am
storage/ndb/test/ndbapi/bank/Makefile.am
storage/ndb/test/src/Makefile.am
storage/ndb/test/tools/Makefile.am
storage/ndb/tools/Makefile.am
win/configure.js
2717 Jonas Oreland 2008-08-16 [merge]
merge
modified:
storage/ndb/src/kernel/SimBlockList.cpp
storage/ndb/src/kernel/blocks/LocalProxy.cpp
storage/ndb/src/kernel/blocks/LocalProxy.hpp
storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.cpp
storage/ndb/src/kernel/blocks/dblqh/DblqhProxy.hpp
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp
storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.hpp
storage/ndb/src/kernel/main.cpp
storage/ndb/src/kernel/vm/SimulatedBlock.cpp
storage/ndb/src/kernel/vm/SimulatedBlock.hpp
storage/ndb/src/kernel/vm/dummy_nonmt.cpp
storage/ndb/src/kernel/vm/mt.cpp
storage/ndb/src/kernel/vm/mt.hpp
=== modified file 'CMakeLists.txt'
--- a/CMakeLists.txt 2008-03-27 23:46:43 +0000
+++ b/CMakeLists.txt 2008-08-20 13:22:29 +0000
@@ -16,9 +16,10 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.4.7 FATAL_ERROR)
PROJECT(MySql)
+INCLUDE(config.cmake)
# This reads user configuration, generated by configure.js.
-INCLUDE(win/configure.data)
+INCLUDE(win/configure.data OPTIONAL)
# Hardcode support for CSV storage engine
SET(WITH_CSV_STORAGE_ENGINE TRUE)
@@ -75,8 +76,26 @@ IF(WITH_FEDERATED_STORAGE_ENGINE)
ADD_DEFINITIONS(-DWITH_FEDERATED_STORAGE_ENGINE)
SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_federated_plugin")
ENDIF(WITH_FEDERATED_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")
+ SET (NDB_CLIENT_INCLUDES
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/ndbapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/portlib
+ )
+ SET (NDB_HANDLER_SRC
+ ha_ndbcluster.cc ha_ndbcluster_cond.cc
+ ha_ndbcluster_connection.cc ha_ndbcluster_binlog.cc
+ )
+ELSE(WITH_NDBCLUSTER_STORAGE_ENGINE)
+ SET (NDB_CLIENT_INCLUDES "")
+ SET (NDB_HANDLER_SRC "")
+ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE)
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc @ONLY)
SET(localstatedir "C:\\mysql\\data")
@@ -108,17 +127,20 @@ SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAK
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805")
-IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")
+IF(CMAKE_GENERATOR MATCHES "Visual Studio 8" OR
+ CMAKE_GENERATOR MATCHES "Visual Studio 9")
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" OR
+ CMAKE_GENERATOR MATCHES "Visual Studio 9")
IF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
- CMAKE_GENERATOR MATCHES "Visual Studio 8")
+ CMAKE_GENERATOR MATCHES "Visual Studio 8" OR
+ CMAKE_GENERATOR MATCHES "Visual Studio 9")
# replace /MDd with /MTd
STRING(REPLACE "/MD" "/MT" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
@@ -151,7 +173,8 @@ IF(CMAKE_GENERATOR MATCHES "Visual Studi
ENDIF(NOT tmp_manifest)
ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR
- CMAKE_GENERATOR MATCHES "Visual Studio 8")
+ CMAKE_GENERATOR MATCHES "Visual Studio 8" OR
+ CMAKE_GENERATOR MATCHES "Visual Studio 9")
IF(WIN32)
ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")
@@ -249,6 +272,9 @@ ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
IF(WITH_INNOBASE_STORAGE_ENGINE)
ADD_SUBDIRECTORY(storage/innobase)
ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
+IF(WITH_NDBCLUSTER_STORAGE_ENGINE)
+ ADD_SUBDIRECTORY(storage/ndb)
+ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE)
ADD_SUBDIRECTORY(sql)
ADD_SUBDIRECTORY(server-tools/instance-manager)
ADD_SUBDIRECTORY(libmysql)
=== modified file 'Makefile.am'
--- a/Makefile.am 2008-05-23 07:55:34 +0000
+++ b/Makefile.am 2008-08-20 13:22:09 +0000
@@ -19,7 +19,8 @@ AUTOMAKE_OPTIONS = foreign
# 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@ \
@readline_topdir@ sql-common scripts \
=== modified file 'client/CMakeLists.txt'
--- a/client/CMakeLists.txt 2008-02-07 13:07:41 +0000
+++ b/client/CMakeLists.txt 2008-08-20 13:22:29 +0000
@@ -12,12 +12,12 @@
# 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("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake")
-
# We use the "mysqlclient_notls" library here just as safety, in case
# any of the clients here would go beond the client API and access the
# Thread Local Storage directly.
+INCLUDE("${PROJECT_SOURCE_DIR}/win/mysql_manifest.cmake")
+
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
=== added file 'config.cmake'
--- a/config.cmake 1970-01-01 00:00:00 +0000
+++ b/config.cmake 2008-08-20 13:22:09 +0000
@@ -0,0 +1,110 @@
+# 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 "${PARSE_VERSION}")
+STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)"
+ "\\1" PARSE_VERSION_MAJOR "${PARSE_VERSION}")
+STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)"
+ "\\2" PARSE_VERSION_MINOR "${PARSE_VERSION}")
+STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)-?(.*)"
+ "\\3" PARSE_VERSION_BUILD "${PARSE_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 "[^-]+-[^-]+-(.+)"
+ "\\1" PARSE_NDB_VERSION "${PARSE_VERSION}")
+STRING(REGEX REPLACE "(.+\\..+).+"
+ "\\1" PARSE_NDB_BASE_VERSION "${PARSE_NDB_VERSION}")
+STRING(REGEX REPLACE "([0-9]+).+"
+ "\\1" PARSE_NDB_VERSION_MAJOR "${PARSE_NDB_VERSION}")
+STRING(REGEX REPLACE "[0-9]+\\.([0-9]+).*"
+ "\\1" PARSE_NDB_VERSION_MINOR "${PARSE_NDB_VERSION}")
+STRING(REGEX REPLACE ".+\\..+\\.([0-9]+).*"
+ "\\1" PARSE_NDB_VERSION_BUILD "${PARSE_NDB_VERSION}")
+
+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_MYSQL_VERSION_MAJOR "${PARSE_VERSION_MAJOR}" CACHE STRING "NDB MySQL Major
Version" FORCE)
+SET(NDB_MYSQL_VERSION_MINOR "${PARSE_VERSION_MINOR}" CACHE STRING "NDB MySQL Minor
Version" FORCE)
+SET(NDB_MYSQL_VERSION_BUILD "${PARSE_VERSION_BUILD}" CACHE STRING "NDB MySQL Build
Version" FORCE)
+SET(NDB_VERSION_MAJOR "${PARSE_NDB_VERSION_MAJOR}" CACHE STRING "NDB Major Version"
FORCE)
+SET(NDB_VERSION_MINOR "${PARSE_NDB_VERSION_MINOR}" CACHE STRING "NDB Minor Version"
FORCE)
+SET(NDB_VERSION_BUILD "${PARSE_NDB_VERSION_BUILD}" CACHE STRING "NDB Build Version"
FORCE)
=== modified file 'extra/CMakeLists.txt'
--- a/extra/CMakeLists.txt 2008-01-28 14:16:40 +0000
+++ b/extra/CMakeLists.txt 2008-08-20 13:22:09 +0000
@@ -18,6 +18,11 @@ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_F
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}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/ndbapi
+ ${CMAKE_SOURCE_DIR}/storage/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)
=== modified file 'mysys/CMakeLists.txt'
--- a/mysys/CMakeLists.txt 2007-11-07 22:47:25 +0000
+++ b/mysys/CMakeLists.txt 2008-08-20 13:22:09 +0000
@@ -45,4 +45,5 @@ SET(MYSYS_SOURCES array.c charset-def.c
IF(NOT SOURCE_SUBLIBS)
ADD_LIBRARY(mysys ${MYSYS_SOURCES})
+ TARGET_LINK_LIBRARIES(mysys dbug strings zlib)
ENDIF(NOT SOURCE_SUBLIBS)
=== modified file 'sql/CMakeLists.txt'
--- a/sql/CMakeLists.txt 2008-05-12 16:34:25 +0000
+++ b/sql/CMakeLists.txt 2008-08-20 13:22:09 +0000
@@ -41,11 +41,16 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOUR
ADD_DEFINITIONS(-DMYSQL_SERVER -D_CONSOLE -DHAVE_DLOPEN -DHAVE_EVENT_SCHEDULER)
+IF(WITH_NDBCLUSTER_STORAGE_ENGINE)
+ INCLUDE_DIRECTORIES(${NDB_CLIENT_INCLUDES})
+ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE)
+
ADD_EXECUTABLE(mysqld
../sql-common/client.c derror.cc des_key_file.cc
discover.cc ../libmysql/errmsg.c field.cc stacktrace.c stacktrace.h
field_conv.cc
filesort.cc gstream.cc
ha_partition.cc
+ ${NDB_HANDLER_SRC}
handler.cc hash_filo.cc hash_filo.h
hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc
item_create.cc item_func.cc item_geofunc.cc item_row.cc
@@ -121,6 +126,10 @@ ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
IF(WITH_INNOBASE_STORAGE_ENGINE)
TARGET_LINK_LIBRARIES(mysqld innobase)
ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
+IF(WITH_NDBCLUSTER_STORAGE_ENGINE)
+ TARGET_LINK_LIBRARIES(mysqld ndbclient)
+ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE)
+
ADD_DEPENDENCIES(mysqld GenError)
=== added file 'storage/ndb/CMakeLists.txt'
--- a/storage/ndb/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/CMakeLists.txt 2008-08-20 13:22:09 +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
+
+SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DVM_TRACE")
+SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DVM_TRACE")
+ADD_SUBDIRECTORY(include)
+ADD_SUBDIRECTORY(src)
+ADD_SUBDIRECTORY(tools)
+ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(docs)
=== modified file 'storage/ndb/Makefile.am'
--- a/storage/ndb/Makefile.am 2008-03-11 15:27:35 +0000
+++ b/storage/ndb/Makefile.am 2008-08-20 13:22:09 +0000
@@ -15,7 +15,7 @@
SUBDIRS = src tools . include swig @ndb_opt_subdirs@
DIST_SUBDIRS = src tools include test docs swig
-EXTRA_DIST = config ndbapi-examples plug.in
+EXTRA_DIST = config ndbapi-examples plug.in CMakeLists.txt
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
include $(top_srcdir)/storage/ndb/config/common.mk.am
=== added file 'storage/ndb/config/type_kernel.cmake'
--- a/storage/ndb/config/type_kernel.cmake 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/config/type_kernel.cmake 2008-08-20 13:22:09 +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_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_BINARY_DIR}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/kernel/vm
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/kernel/error
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/kernel
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/kernel
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/transporter
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/debugger
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmcommon
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/ndbapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/logger
+ ${CMAKE_SOURCE_DIR}/zlib)
+
=== added file 'storage/ndb/config/type_mgmapiclient.cmake'
--- a/storage/ndb/config/type_mgmapiclient.cmake 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/config/type_mgmapiclient.cmake 2008-08-20 13:22:09 +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}/storage/ndb/include/mgmapi)
=== added file 'storage/ndb/config/type_ndbapi.cmake'
--- a/storage/ndb/config/type_ndbapi.cmake 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/config/type_ndbapi.cmake 2008-08-20 13:22:09 +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}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/mysys
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/kernel
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/transporter
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/debugger
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmcommon
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/ndbapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/logger)
=== added file 'storage/ndb/config/type_ndbapiclient.cmake'
--- a/storage/ndb/config/type_ndbapiclient.cmake 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/config/type_ndbapiclient.cmake 2008-08-20 13:22:09 +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}/storage/ndb/include/ndbapi)
=== added file 'storage/ndb/config/type_ndbapitest.cmake'
--- a/storage/ndb/config/type_ndbapitest.cmake 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/config/type_ndbapitest.cmake 2008-08-20 13:22:09 +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}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/ndbapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/storage/ndb/test/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi)
=== added file 'storage/ndb/config/type_ndbapitools.cmake'
--- a/storage/ndb/config/type_ndbapitools.cmake 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/config/type_ndbapitools.cmake 2008-08-20 13:22:09 +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}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/ndbapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/storage/ndb/test/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/kernel)
=== added file 'storage/ndb/config/type_util.cmake'
--- a/storage/ndb/config/type_util.cmake 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/config/type_util.cmake 2008-08-20 13:22:09 +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}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/mysys
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/logger)
=== added file 'storage/ndb/include/CMakeLists.txt'
--- a/storage/ndb/include/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/include/CMakeLists.txt 2008-08-20 13:22:09 +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)
=== modified file 'storage/ndb/include/Makefile.am'
--- a/storage/ndb/include/Makefile.am 2007-06-14 10:58:03 +0000
+++ b/storage/ndb/include/Makefile.am 2008-08-20 13:22:09 +0000
@@ -58,7 +58,7 @@ ndb_global.h \
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`
=== added file 'storage/ndb/src/CMakeLists.txt'
--- a/storage/ndb/src/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/CMakeLists.txt 2008-08-20 13:22:29 +0000
@@ -0,0 +1,39 @@
+# 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}/storage/ndb/include
+ {CMAKE_SOURCE_DIR}/include)
+
+FILE(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/dummy.cpp "")
+ADD_LIBRARY(ndbclient STATIC dummy.cpp)
+TARGET_LINK_LIBRARIES(ndbclient
+ ndbapi
+ ndbtransport
+ ndbtrace
+ ndbsignaldata
+ ndbmgmapi
+ ndbmgmsrv
+ ndblogger
+ ndbportlib
+ ndbgeneral)
=== modified file 'storage/ndb/src/Makefile.am'
--- a/storage/ndb/src/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/Makefile.am 2008-08-20 13:22:09 +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)/storage/ndb/config/common.mk.am
=== added file 'storage/ndb/src/common/CMakeLists.txt'
--- a/storage/ndb/src/common/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/common/CMakeLists.txt 2008-08-20 13:22:09 +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)
+
=== modified file 'storage/ndb/src/common/Makefile.am'
--- a/storage/ndb/src/common/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/Makefile.am 2008-08-20 13:22:09 +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
=== added file 'storage/ndb/src/common/debugger/CMakeLists.txt'
--- a/storage/ndb/src/common/debugger/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/common/debugger/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbtrace STATIC
+ SignalLoggerManager.cpp
+ DebuggerNames.cpp
+ BlockNames.cpp
+ EventLogger.cpp
+ GrepError.cpp)
+
=== modified file 'storage/ndb/src/common/debugger/Makefile.am'
--- a/storage/ndb/src/common/debugger/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/debugger/Makefile.am 2008-08-20 13:22:09 +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
=== added file 'storage/ndb/src/common/debugger/signaldata/CMakeLists.txt'
--- a/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/CMakeLists.txt 2008-08-20 13:22:09 +0000
@@ -0,0 +1,48 @@
+# 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}/storage/ndb/config/type_ndbapi.cmake)
+ADD_LIBRARY(ndbsignaldata STATIC
+ AlterIndxImpl.cpp BuildIndxImpl.cpp BuildIndx.cpp
+ CreateEvnt.cpp CreateIndxImpl.cpp CreateTab.cpp
+ CreateTable.cpp CreateTrigImpl.cpp #DihSwitchReplicaReq.cpp
+ DropIndxImpl.cpp DropTable.cpp DropTrigImpl.cpp
+ GetTabInfo.cpp
+ SchemaTrans.cpp SchemaTransImpl.cpp
+ 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
+ GCP.cpp DictTabInfo.cpp
+ AlterTable.cpp AlterTab.cpp
+ CreateTrig.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 )
+
=== modified file 'storage/ndb/src/common/debugger/signaldata/Makefile.am'
--- a/storage/ndb/src/common/debugger/signaldata/Makefile.am 2008-02-06 20:10:07 +0000
+++ b/storage/ndb/src/common/debugger/signaldata/Makefile.am 2008-08-20 13:22:09 +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 = \
=== added file 'storage/ndb/src/common/logger/CMakeLists.txt'
--- a/storage/ndb/src/common/logger/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/common/logger/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_ndbapi.cmake)
+
+ADD_LIBRARY(ndblogger STATIC
+ Logger.cpp
+ LogHandlerList.cpp
+ LogHandler.cpp
+ ConsoleLogHandler.cpp
+ FileLogHandler.cpp)
=== modified file 'storage/ndb/src/common/logger/Makefile.am'
--- a/storage/ndb/src/common/logger/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/logger/Makefile.am 2008-08-20 13:22:09 +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 \
=== added file 'storage/ndb/src/common/mgmcommon/CMakeLists.txt'
--- a/storage/ndb/src/common/mgmcommon/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/common/mgmcommon/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/src/mgmapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmsrv)
+INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapi.cmake)
+INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_mgmapiclient.cmake)
+
+ADD_LIBRARY(ndbmgmsrv STATIC
+ ConfigRetriever.cpp
+ IPCConfig.cpp)
+
=== modified file 'storage/ndb/src/common/mgmcommon/Makefile.am'
--- a/storage/ndb/src/common/mgmcommon/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/mgmcommon/Makefile.am 2008-08-20 13:22:09 +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 = \
=== added file 'storage/ndb/src/common/portlib/CMakeLists.txt'
--- a/storage/ndb/src/common/portlib/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/common/portlib/CMakeLists.txt 2008-08-20 13:22:29 +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_BINARY_DIR}/storage/ndb/config/type_util.cmake)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/ndbapi
+ )
+
+IF(WIN32)
+ SET(EXTRA_SRC win32/NdbTick.c
+ # win32/NdbDaemon.c ${CMAKE_SOURCE_DIR}/sql/nt_servc.cc
+ )
+ SET(EXTRA_LIB wsock32 ws2_32)
+ENDIF(WIN32)
+ADD_LIBRARY(ndbportlib STATIC
+ NdbCondition.c NdbMutex.c
+ NdbEnv.c NdbThread.c NdbHost.c NdbTCP.cpp
+ NdbMem.c NdbConfig.c NdbTick.c
+ ${EXTRA_SRC}
+)
+TARGET_LINK_LIBRARIES(ndbportlib mysys ${EXTRA_LIB})
+
+#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)
+
=== modified file 'storage/ndb/src/common/portlib/Makefile.am'
--- a/storage/ndb/src/common/portlib/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/common/portlib/Makefile.am 2008-08-20 13:22:09 +0000
@@ -13,10 +13,12 @@
# 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 win32/CMakeLists.txt win32/NdbTick.c
+
noinst_LTLIBRARIES = libportlib.la
libportlib_la_SOURCES = \
- NdbCondition.c NdbMutex.c NdbSleep.c NdbTick.c \
+ NdbCondition.c NdbMutex.c NdbTick.c NdbSleep.c \
NdbEnv.c NdbThread.c NdbHost.c NdbTCP.cpp \
NdbDaemon.c NdbMem.c \
NdbConfig.c
@@ -24,36 +26,11 @@ libportlib_la_SOURCES = \
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_util.mk.am
+INCLUDES += -I$(top_srcdir)/ndb/include/util -I$(top_srcdir)/ndb/include/ndbapi
+
EXTRA_PROGRAMS = memtest PortLibTest munmaptest
PortLibTest_SOURCES = NdbPortLibTest.cpp
munmaptest_SOURCES = munmaptest.cpp
-# Don't update the files from bitkeeper
-WIN_src = 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
-
-windoze-dsp: libportlib.dsp
-
-libportlib.dsp: Makefile \
- $(top_srcdir)/storage/ndb/config/win-lib.am \
- $(top_srcdir)/storage/ndb/config/win-name \
- $(top_srcdir)/storage/ndb/config/win-includes \
- $(top_srcdir)/storage/ndb/config/win-sources \
- $(top_srcdir)/storage/ndb/config/win-libraries
- cat $(top_srcdir)/storage/ndb/config/win-lib.am > $@
- @$(top_srcdir)/storage/ndb/config/win-name $@ $(noinst_LTLIBRARIES)
- @$(top_srcdir)/storage/ndb/config/win-includes $@ $(INCLUDES)
- @$(top_srcdir)/storage/ndb/config/win-sources $@ $(WIN_src)
- @$(top_srcdir)/storage/ndb/config/win-libraries $@ LIB $(LDADD)
-
-# Don't update the files from bitkeeper
%::SCCS/s.%
=== added file 'storage/ndb/src/common/transporter/CMakeLists.txt'
--- a/storage/ndb/src/common/transporter/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/common/transporter/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_util.cmake)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/debugger
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/kernel
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/transporter
+ ${NDB_SCI_INCLUDES})
+
+ADD_LIBRARY(ndbtransport STATIC
+ Transporter.cpp SendBuffer.cpp TCP_Transporter.cpp
+ TransporterRegistry.cpp Packer.cpp)
+
=== modified file 'storage/ndb/src/common/transporter/Makefile.am'
--- a/storage/ndb/src/common/transporter/Makefile.am 2008-05-29 15:06:11 +0000
+++ b/storage/ndb/src/common/transporter/Makefile.am 2008-08-20 13:22:09 +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 = \
=== added file 'storage/ndb/src/common/util/CMakeLists.txt'
--- a/storage/ndb/src/common/util/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/common/util/CMakeLists.txt 2008-08-20 13:22:29 +0000
@@ -0,0 +1,54 @@
+# 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}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/mysys
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/logger)
+
+ADD_DEFINITIONS(-DNO_DUMMY_DECL)
+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
+ ndb_rand.c
+ version.c
+ strdup.c
+ ConfigValues.cpp
+ ndb_init.cpp
+ ndb_opts.c
+ basestring_vsnprintf.c
+ Bitmask.cpp)
+TARGET_LINK_LIBRARIES(ndbgeneral zlib)
=== modified file 'storage/ndb/src/common/util/Makefile.am'
--- a/storage/ndb/src/common/util/Makefile.am 2008-08-08 12:32:37 +0000
+++ b/storage/ndb/src/common/util/Makefile.am 2008-08-20 13:22:09 +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 libndbazio.la
libgeneral_la_SOURCES = \
=== added file 'storage/ndb/src/kernel/CMakeLists.txt'
--- a/storage/ndb/src/kernel/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/CMakeLists.txt 2008-08-20 13:22:29 +0000
@@ -0,0 +1,80 @@
+# 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}/storage/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
+ ${CMAKE_SOURCE_DIR}/storage/ndb/mgmsrv
+ ${CMAKE_SOURCE_DIR}/storage/ndb/mgmapi
+)
+
+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
+ ndbblocks
+ ndbsched
+ dbug
+ mysys
+ strings
+ ndbconf
+ ${NDB_SCI_LIBS})
+ADD_EXECUTABLE(ndbd
+ main.cpp
+ SimBlockList.cpp
+ ../mgmsrv/ConfigInfo.cpp
+ ../mgmsrv/Config.cpp
+ ../mgmsrv/InitConfigFileParser.cpp
+)
=== modified file 'storage/ndb/src/kernel/Makefile.am'
--- a/storage/ndb/src/kernel/Makefile.am 2008-04-25 23:41:47 +0000
+++ b/storage/ndb/src/kernel/Makefile.am 2008-08-20 13:22:09 +0000
@@ -14,6 +14,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
SUBDIRS = vm error blocks
+EXTRA_DIST = CMakeLists.txt
include $(top_srcdir)/storage/ndb/config/common.mk.am
=== added file 'storage/ndb/src/kernel/blocks/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/CMakeLists.txt 2008-08-20 13:22:09 +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
+
+
+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)
+
+INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbblocks STATIC
+ diskpage.cpp
+ lgman.cpp
+ pgman.cpp
+ print_file.cpp
+ restore.cpp
+ tsman.cpp
+ )
+
=== modified file 'storage/ndb/src/kernel/blocks/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/Makefile.am 2008-07-26 05:13:40 +0000
+++ b/storage/ndb/src/kernel/blocks/Makefile.am 2008-08-20 13:22:09 +0000
@@ -77,6 +77,8 @@ include $(top_srcdir)/storage/ndb/config
# Don't update the files from bitkeeper
%::SCCS/s.%
+EXTRA_DIST = CMakeLists.txt
+
windoze-dsp:
# Don't update the files from bitkeeper
=== added file 'storage/ndb/src/kernel/blocks/backup/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/backup/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbbackup STATIC
+ Backup.cpp BackupInit.cpp)
=== modified file 'storage/ndb/src/kernel/blocks/backup/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/backup/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/blocks/backup/Makefile.am 2008-08-20 13:22:09 +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
+
ndbtools_PROGRAMS = ndb_print_backup_file
ndb_print_backup_file_SOURCES = read.cpp
ndb_print_backup_file_LDFLAGS = @ndb_bin_am_ldflags@ \
=== added file 'storage/ndb/src/kernel/blocks/cmvmi/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/cmvmi/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/cmvmi/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbcmvmi STATIC
+ Cmvmi.cpp)
=== added file 'storage/ndb/src/kernel/blocks/dbacc/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbacc/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/dbacc/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/src/kernel/blocks/dbtup)
+INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbdbacc STATIC
+ DbaccInit.cpp DbaccMain.cpp)
=== added file 'storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/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)
=== modified file 'storage/ndb/src/kernel/blocks/dbdict/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbdict/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdict/Makefile.am 2008-08-20 13:22:09 +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
+
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
=== added file 'storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/CMakeLists.txt 2008-08-20 13:22:09 +0000
@@ -0,0 +1,31 @@
+# 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}/storage/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)
+TARGET_LINK_LIBRARIES(ndbd_sysfile_reader dbug mysys strings)
=== modified file 'storage/ndb/src/kernel/blocks/dbdih/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbdih/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/blocks/dbdih/Makefile.am 2008-08-20 13:22:09 +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
+
ndbtools_PROGRAMS = ndb_print_sys_file
ndb_print_sys_file_SOURCES = printSysfile.cpp
ndb_print_sys_file_LDFLAGS = @ndb_bin_am_ldflags@ \
=== added file 'storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/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/reader.cpp)
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dblqh/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/Makefile.am 2008-08-20 13:22:09 +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
+
bin_PROGRAMS = ndbd_redo_log_reader
ndbd_redo_log_reader_SOURCES = redoLogReader/records.cpp \
=== added file 'storage/ndb/src/kernel/blocks/dbtc/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbtc/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbdbtc
+ DbtcInit.cpp
+ DbtcMain.cpp)
=== added file 'storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/CMakeLists.txt 2008-08-20 13:22:09 +0000
@@ -0,0 +1,40 @@
+# 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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbdbtup STATIC
+ DbtupExecQuery.cpp
+ DbtupBuffer.cpp
+ DbtupRoutines.cpp
+ DbtupCommit.cpp
+ DbtupFixAlloc.cpp
+ DbtupTrigger.cpp
+ DbtupAbort.cpp
+ DbtupPageMap.cpp
+ DbtupPagMan.cpp
+ DbtupStoredProcDef.cpp
+ DbtupMeta.cpp
+ DbtupTabDesMan.cpp
+ DbtupGen.cpp
+ DbtupIndex.cpp
+ DbtupScan.cpp
+ DbtupDebug.cpp
+ DbtupDiskAlloc.cpp
+ DbtupVarAlloc.cpp
+ tuppage.cpp
+ Undo_buffer.cpp
+)
=== modified file 'storage/ndb/src/kernel/blocks/dbtup/Makefile.am'
--- a/storage/ndb/src/kernel/blocks/dbtup/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtup/Makefile.am 2008-08-20 13:22:09 +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
+
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
=== added file 'storage/ndb/src/kernel/blocks/dbtux/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbtux/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtux/CMakeLists.txt 2008-08-20 13:22:09 +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_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/src/kernel/blocks/dbtup)
+INCLUDE(${CMAKE_SOURCE_DIR}/storage/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
+ DbtuxStat.cpp
+)
+
=== added file 'storage/ndb/src/kernel/blocks/dbutil/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/dbutil/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/dbutil/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbdbutil STATIC
+ DbUtil.cpp)
=== added file 'storage/ndb/src/kernel/blocks/ndbcntr/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/ndbcntr/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbcntr/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbndbcntr STATIC
+ NdbcntrInit.cpp
+ NdbcntrSysTable.cpp
+ NdbcntrMain.cpp)
=== added file 'storage/ndb/src/kernel/blocks/ndbfs/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/ndbfs/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/ndbfs/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbndbfs STATIC
+ AsyncFile.cpp Ndbfs.cpp VoidFs.cpp Filename.cpp CircularIndex.cpp
+ Win32AsyncFile.cpp
+)
=== added file 'storage/ndb/src/kernel/blocks/qmgr/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/qmgr/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/qmgr/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbqmgr STATIC
+ QmgrInit.cpp QmgrMain.cpp)
=== added file 'storage/ndb/src/kernel/blocks/suma/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/suma/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/suma/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbsuma STATIC
+ Suma.cpp SumaInit.cpp)
=== added file 'storage/ndb/src/kernel/blocks/trix/CMakeLists.txt'
--- a/storage/ndb/src/kernel/blocks/trix/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/blocks/trix/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbtrix STATIC
+ Trix.cpp)
=== added file 'storage/ndb/src/kernel/error/CMakeLists.txt'
--- a/storage/ndb/src/kernel/error/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/error/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndberror STATIC
+ TimeModule.cpp
+ ErrorReporter.cpp
+ ndbd_exit_codes.c)
=== modified file 'storage/ndb/src/kernel/error/Makefile.am'
--- a/storage/ndb/src/kernel/error/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/src/kernel/error/Makefile.am 2008-08-20 13:22:09 +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 \
=== added file 'storage/ndb/src/kernel/vm/CMakeLists.txt'
--- a/storage/ndb/src/kernel/vm/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/kernel/vm/CMakeLists.txt 2008-08-20 13:22:09 +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_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi)
+INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_kernel.cmake)
+
+ADD_LIBRARY(ndbkernel STATIC
+ VMSignal.cpp
+ Emulator.cpp
+ Configuration.cpp
+ WatchDog.cpp
+ SimplePropertiesSection.cpp
+ SectionReader.cpp
+ Mutex.cpp
+ SafeCounter.cpp
+ ndbd_malloc_impl.cpp
+ ndbd_malloc.cpp
+ DynArr256.cpp
+ LockQueue.cpp
+ Pool.cpp
+ RWPool.cpp
+ Rope.cpp
+ WOPool.cpp
+)
+ADD_LIBRARY(ndbsched STATIC
+ TimeQueue.cpp
+ ThreadConfig.cpp
+ FastScheduler.cpp
+ TransporterCallback_nonmt.cpp
+ SimulatedBlock_nonmt.cpp
+)
=== modified file 'storage/ndb/src/kernel/vm/Makefile.am'
--- a/storage/ndb/src/kernel/vm/Makefile.am 2008-07-25 05:48:32 +0000
+++ b/storage/ndb/src/kernel/vm/Makefile.am 2008-08-20 13:22:09 +0000
@@ -51,10 +51,12 @@ libsched_mt_a_SOURCES = SimulatedBlock_m
mt.cpp \
dummy_mt.cpp
-EXTRA_DIST=SimulatedBlock.cpp TransporterCallback.cpp
+EXTRA_DIST=SimulatedBlock.cpp TransporterCallback.cpp CMakeLists.txt
INCLUDES_LOC = -I$(top_srcdir)/storage/ndb/src/mgmapi
+LDADD_LOC = $(top_builddir)/ndb/src/common/util/libgeneral.la
+
include $(top_srcdir)/storage/ndb/config/common.mk.am
include $(top_srcdir)/storage/ndb/config/type_kernel.mk.am
=== added file 'storage/ndb/src/mgmapi/CMakeLists.txt'
--- a/storage/ndb/src/mgmapi/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/mgmapi/CMakeLists.txt 2008-08-20 13:22:29 +0000
@@ -0,0 +1,29 @@
+# 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}/storage/ndb/config/type_util.cmake)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi,
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/kernel
+ ${CMAKE_SOURCE_DIR}/storage/ndb/mgmsrv
+)
+ADD_DEFINITIONS(-DNDB_MGMAPI)
+ADD_LIBRARY(ndbmgmapi STATIC
+ mgmapi.cpp
+ ndb_logevent.cpp
+ mgmapi_configuration.cpp
+ LocalConfig.cpp
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/kernel/error/ndbd_exit_codes.c)
+TARGET_LINK_LIBRARIES(ndbmgmapi ndbconf)
=== modified file 'storage/ndb/src/mgmapi/Makefile.am'
--- a/storage/ndb/src/mgmapi/Makefile.am 2007-04-13 09:33:08 +0000
+++ b/storage/ndb/src/mgmapi/Makefile.am 2008-08-20 13:22:09 +0000
@@ -15,6 +15,8 @@
MYSQLCLUSTERdir= .
+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 ../mgmsrv/ConfigInfo.cpp
=== added file 'storage/ndb/src/mgmclient/CMakeLists.txt'
--- a/storage/ndb/src/mgmclient/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/mgmclient/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_ndbapi.cmake)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/common/mgmcommon)
+
+ADD_LIBRARY(ndbmgmclient STATIC
+ CommandInterpreter.cpp)
+
+LINK_LIBRARIES(ndbmgmclient
+ ndbmgmapi
+ ndblogger
+ ndbtrace
+ ndbportlib
+ ndbgeneral
+ dbug
+ mysys
+ strings)
+
+ADD_EXECUTABLE(ndb_mgm
+ main.cpp)
=== modified file 'storage/ndb/src/mgmclient/Makefile.am'
--- a/storage/ndb/src/mgmclient/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/mgmclient/Makefile.am 2008-08-20 13:22:09 +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
=== added file 'storage/ndb/src/mgmsrv/CMakeLists.txt'
--- a/storage/ndb/src/mgmsrv/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/mgmsrv/CMakeLists.txt 2008-08-20 13:22:29 +0000
@@ -0,0 +1,46 @@
+# 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}/storage/ndb/config/type_ndbapi.cmake)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/common/mgmcommon
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmclient
+ ${CMAKE_SOURCE_DIR}/sql)
+
+LINK_LIBRARIES(ndbmgmclient
+ ndbclient
+ dbug
+ mysys
+ strings
+ ndbgeneral
+ ndbportlib
+ ${NDB_SCI_LIBS})
+
+ADD_LIBRARY(ndbconf
+ Config.cpp
+ ConfigInfo.cpp
+ InitConfigFileParser.cpp
+)
+
+ADD_EXECUTABLE(ndb_mgmd
+ MgmtSrvr.cpp
+ main.cpp
+ Services.cpp
+ MgmtSrvrConfig.cpp
+ ${CMAKE_SOURCE_DIR}/sql/nt_servc.cc)
+TARGET_LINK_LIBRARIES(ndb_mgmd ndbconf)
=== modified file 'storage/ndb/src/mgmsrv/Makefile.am'
--- a/storage/ndb/src/mgmsrv/Makefile.am 2008-06-09 10:52:24 +0000
+++ b/storage/ndb/src/mgmsrv/Makefile.am 2008-08-20 13:22:09 +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)
=== added file 'storage/ndb/src/ndbapi/CMakeLists.txt'
--- a/storage/ndb/src/ndbapi/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/src/ndbapi/CMakeLists.txt 2008-08-20 13:22:09 +0000
@@ -0,0 +1,57 @@
+# 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}/storage/ndb/config/type_ndbapi.cmake)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi)
+
+ADD_LIBRARY(ndbapi STATIC
+ NdbEventOperation.cpp
+ NdbEventOperationImpl.cpp
+ NdbIndexStat.cpp
+ NdbInterpretedCode.cpp
+ 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)
=== modified file 'storage/ndb/src/ndbapi/Makefile.am'
--- a/storage/ndb/src/ndbapi/Makefile.am 2008-04-25 06:32:23 +0000
+++ b/storage/ndb/src/ndbapi/Makefile.am 2008-08-20 13:22:09 +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_PROGRAMS = ndberror_check
=== added file 'storage/ndb/test/CMakeLists.txt'
--- a/storage/ndb/test/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/CMakeLists.txt 2008-08-20 13:22:09 +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)
=== modified file 'storage/ndb/test/Makefile.am'
--- a/storage/ndb/test/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/test/Makefile.am 2008-08-20 13:22:09 +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`
=== added file 'storage/ndb/test/ndbapi/CMakeLists.txt'
--- a/storage/ndb/test/ndbapi/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/ndbapi/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/ndb/config/type_ndbapitest.cmake)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/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)
+TARGET_LINK_LIBRARIES(testNodeRestart ndbclient)
+ADD_EXECUTABLE(testOIBasic testOIBasic.cpp)
+TARGET_LINK_LIBRARIES(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)
+
=== modified file 'storage/ndb/test/ndbapi/Makefile.am'
--- a/storage/ndb/test/ndbapi/Makefile.am 2008-07-01 15:01:50 +0000
+++ b/storage/ndb/test/ndbapi/Makefile.am 2008-08-20 13:22:09 +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 \
=== added file 'storage/ndb/test/ndbapi/bank/CMakeLists.txt'
--- a/storage/ndb/test/ndbapi/bank/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/ndbapi/bank/CMakeLists.txt 2008-08-20 13:22:09 +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}/storage/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)
=== modified file 'storage/ndb/test/ndbapi/bank/Makefile.am'
--- a/storage/ndb/test/ndbapi/bank/Makefile.am 2006-12-31 00:32:21 +0000
+++ b/storage/ndb/test/ndbapi/bank/Makefile.am 2008-08-20 13:22:09 +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
=== added file 'storage/ndb/test/src/CMakeLists.txt'
--- a/storage/ndb/test/src/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/src/CMakeLists.txt 2008-08-20 13:22:09 +0000
@@ -0,0 +1,46 @@
+# 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}/storage/ndb/test/include
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/common/mgmcommon
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmcommon
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/kernel
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi)
+INCLUDE(${CMAKE_SOURCE_DIR}/storage/ndb/config/type_ndbapitest.cmake)
+
+ADD_LIBRARY(ndbNDBT STATIC
+ NDBT_ReturnCodes.cpp
+ NDBT_Error.cpp
+ NDBT_Tables.cpp
+ NDBT_ResultRow.cpp
+ NDBT_Test.cpp
+ NDBT_Thread.cpp
+ NdbMixRestarter.cpp
+ HugoCalculator.cpp
+ HugoOperations.cpp
+ HugoTransactions.cpp
+ HugoAsynchTransactions.cpp
+ UtilTransactions.cpp
+ NdbRestarter.cpp
+ NdbRestarts.cpp
+ NDBT_Output.cpp
+ NdbBackup.cpp
+ NdbConfig.cpp
+ NDBT_Table.cpp
+ NdbSchemaCon.cpp
+ NdbSchemaOp.cpp
+ getarg.c
+ CpcClient.cpp)
+
=== modified file 'storage/ndb/test/src/Makefile.am'
--- a/storage/ndb/test/src/Makefile.am 2008-06-23 12:38:11 +0000
+++ b/storage/ndb/test/src/Makefile.am 2008-08-20 13:22:09 +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 = \
=== added file 'storage/ndb/test/tools/CMakeLists.txt'
--- a/storage/ndb/test/tools/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/test/tools/CMakeLists.txt 2008-08-20 13:22:29 +0000
@@ -0,0 +1,39 @@
+# 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}/storage/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_DEPENDENCIES(hugoPkRead ndbclient)
+ADD_EXECUTABLE(hugoPkUpdate hugoPkUpdate.cpp)
+ADD_DEPENDENCIES(hugoPkUpdate ndbNDBT)
+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)
=== modified file 'storage/ndb/test/tools/Makefile.am'
--- a/storage/ndb/test/tools/Makefile.am 2007-11-14 12:30:36 +0000
+++ b/storage/ndb/test/tools/Makefile.am 2008-08-20 13:22:09 +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 listen_event eventlog rep_latency ndb_connect
# transproxy
=== added file 'storage/ndb/tools/CMakeLists.txt'
--- a/storage/ndb/tools/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ b/storage/ndb/tools/CMakeLists.txt 2008-08-20 13:22:29 +0000
@@ -0,0 +1,55 @@
+# 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}/storage/ndb/config/type_ndbapitools.cmake)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/zlib
+ ${CMAKE_SOURCE_DIR}/storage/ndb/src/ndbapi
+ ${CMAKE_SOURCE_DIR}/storage/ndb/include/debugger
+)
+
+ADD_EXECUTABLE(ndb_test_platform ndb_test_platform.cpp)
+ADD_EXECUTABLE(ndb_waiter waiter.cpp)
+TARGET_LINK_LIBRARIES(ndb_waiter ndbportlib ndbNDBT)
+ADD_EXECUTABLE(ndb_drop_table drop_tab.cpp)
+TARGET_LINK_LIBRARIES(ndb_drop_table ndbNDBT ndbgeneral)
+ADD_EXECUTABLE(ndb_delete_all delete_all.cpp)
+TARGET_LINK_LIBRARIES(ndb_delete_all ndbNDBT)
+ADD_EXECUTABLE(ndb_desc desc.cpp)
+TARGET_LINK_LIBRARIES(ndb_desc ndbNDBT)
+ADD_EXECUTABLE(ndb_drop_index drop_index.cpp)
+TARGET_LINK_LIBRARIES(ndb_drop_index ndbNDBT)
+ADD_EXECUTABLE(ndb_show_tables listTables.cpp)
+TARGET_LINK_LIBRARIES(ndb_show_tables ndbclient ndbNDBT)
+ADD_EXECUTABLE(ndb_select_all select_all.cpp)
+TARGET_LINK_LIBRARIES(ndb_select_all ndbNDBT)
+ADD_EXECUTABLE(ndb_select_count select_count.cpp)
+TARGET_LINK_LIBRARIES(ndb_select_count ndbNDBT)
+ADD_EXECUTABLE(ndb_restore
+ restore/restore_main.cpp
+ restore/consumer.cpp
+ restore/consumer_restore.cpp
+ restore/consumer_printer.cpp
+ restore/Restore.cpp)
+TARGET_LINK_LIBRARIES(ndb_restore ndbbackup ndbNDBT)
+ADD_EXECUTABLE(ndb_config ndb_config.cpp)
+TARGET_LINK_LIBRARIES(ndb_config ndbmgmclient ndbconf)
+
+SET(options "-I${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmapi")
+SET(options "${options} -I${CMAKE_SOURCE_DIR}/storage/ndb/src/mgmsrv")
+SET(options "${options} -I${CMAKE_SOURCE_DIR}/storage/ndb/include/mgmcommon")
+#SET(options "${options} -DMYSQLCLUSTERDIR=\"\\\"\\\"\"")
+SET_TARGET_PROPERTIES(ndb_config PROPERTIES
+ COMPILE_FLAGS "${options}")
=== modified file 'storage/ndb/tools/Makefile.am'
--- a/storage/ndb/tools/Makefile.am 2008-02-25 12:22:45 +0000
+++ b/storage/ndb/tools/Makefile.am 2008-08-20 13:22:09 +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 =
=== modified file 'win/configure.js'
--- a/win/configure.js 2007-09-21 16:05:54 +0000
+++ b/win/configure.js 2008-08-20 13:22:09 +0000
@@ -44,6 +44,7 @@ try
case "WITH_EXAMPLE_STORAGE_ENGINE":
case "WITH_FEDERATED_STORAGE_ENGINE":
case "WITH_INNOBASE_STORAGE_ENGINE":
+ case "WITH_NDBCLUSTER_STORAGE_ENGINE":
case "WITH_PARTITION_STORAGE_ENGINE":
case "__NT__":
case "CYBOZU":
| Thread | ||
|---|---|---|
| • bzr push into mysql-5.1 branch (stewart:2717 to 2719) | Stewart Smith | 20 Aug |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 1.092 sec. using MySQL 5.1.14-beta-log