|
|
| Applications |
| Mailing Lists |
| Miscellaneous |
| Operating Systems |
| Programming |
[patch 2/2] bk commit into 5.0 tree (antony:1.2489)
Date: Wed Aug 29 2007 - 02:55:08 EDT
Below is the list of changes that have just been committed into a local
5.0 repository of antony. When antony does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet@1.2489, 2007-08-09 01:26:26-07:00, antony@pcg5ppc.xiphis.org +97 -0 changes for NDB on Windows
CMakeLists.txt@1.16, 2007-08-09 01:26:02-07:00, antony@pcg5ppc.xiphis.org +35 -20 Include NDBCluster into build
config.cmake@1.1, 2007-08-09 01:26:18-07:00, antony@pcg5ppc.xiphis.org +95 -0 New BitKeeper file ``config.cmake''
config.cmake@1.0, 2007-08-09 01:26:18-07:00, antony@pcg5ppc.xiphis.org +0 -0
extra/CMakeLists.txt@1.6, 2007-08-09 01:26:02-07:00, antony@pcg5ppc.xiphis.org +5 -0 Include NDBCluster into build
extra/perror.c@1.49, 2007-08-09 01:26:03-07:00, antony@pcg5ppc.xiphis.org +3 -0 Include NDBCluster into build
include/config-win.h@1.86, 2007-08-09 01:26:03-07:00, antony@pcg5ppc.xiphis.org +5 -0 edits for Windows
libmysql/CMakeLists.txt@1.5, 2007-08-09 01:26:03-07:00, antony@pcg5ppc.xiphis.org +2 -2 fix some dependencies
ndb/CMakeLists.txt@1.1, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +22 -0 New BitKeeper file ``ndb/CMakeLists.txt''
ndb/CMakeLists.txt@1.0, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/config/type_kernel.cmake@1.1, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +33 -0 New BitKeeper file ``ndb/config/type_kernel.cmake''
ndb/config/type_kernel.cmake@1.0, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/config/type_mgmapiclient.cmake@1.1, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +16 -0 New BitKeeper file ``ndb/config/type_mgmapiclient.cmake''
ndb/config/type_mgmapiclient.cmake@1.0, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/config/type_ndbapi.cmake@1.1, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +30 -0 New BitKeeper file ``ndb/config/type_ndbapi.cmake''
ndb/config/type_ndbapi.cmake@1.0, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/config/type_ndbapiclient.cmake@1.1, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +16 -0 New BitKeeper file ``ndb/config/type_ndbapiclient.cmake''
ndb/config/type_ndbapiclient.cmake@1.0, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/config/type_ndbapitest.cmake@1.1, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +32 -0 New BitKeeper file ``ndb/config/type_ndbapitest.cmake''
ndb/config/type_ndbapitest.cmake@1.0, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/config/type_ndbapitools.cmake@1.1, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +33 -0 New BitKeeper file ``ndb/config/type_ndbapitools.cmake''
ndb/config/type_ndbapitools.cmake@1.0, 2007-08-09 01:26:17-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/config/type_util.cmake@1.1, 2007-08-09 01:26:18-07:00, antony@pcg5ppc.xiphis.org +24 -0 New BitKeeper file ``ndb/config/type_util.cmake''
ndb/config/type_util.cmake@1.0, 2007-08-09 01:26:18-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/include/CMakeLists.txt@1.1, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +33 -0 New BitKeeper file ``ndb/include/CMakeLists.txt''
ndb/include/CMakeLists.txt@1.0, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/include/ndb_types.h.in@1.17, 2007-08-09 01:26:03-07:00, antony@pcg5ppc.xiphis.org +14 -10 edits for Windows
ndb/include/ndbapi/NdbOperation.hpp@1.38, 2007-08-09 01:26:03-07:00, antony@pcg5ppc.xiphis.org +1 -1 change order because msc++ gets confused easily
ndb/src/CMakeLists.txt@1.1, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +67 -0 New BitKeeper file ``ndb/src/CMakeLists.txt''
ndb/src/CMakeLists.txt@1.0, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/common/CMakeLists.txt@1.1, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +23 -0 New BitKeeper file ``ndb/src/common/CMakeLists.txt''
ndb/src/common/CMakeLists.txt@1.0, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/common/debugger/CMakeLists.txt@1.1, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +27 -0 New BitKeeper file ``ndb/src/common/debugger/CMakeLists.txt''
ndb/src/common/debugger/CMakeLists.txt@1.0, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/common/debugger/signaldata/CMakeLists.txt@1.1, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +43 -0 New BitKeeper file ``ndb/src/common/debugger/signaldata/CMakeLists.txt''
ndb/src/common/debugger/signaldata/CMakeLists.txt@1.0, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/common/debugger/signaldata/CntrStart.cpp@1.3, 2007-08-09 01:26:03-07:00, antony@pcg5ppc.xiphis.org +1 -0 pick up ndb_global values first
ndb/src/common/debugger/signaldata/ReadNodesConf.cpp@1.3, 2007-08-09 01:26:04-07:00, antony@pcg5ppc.xiphis.org +1 -0 pick up ndb_global values first
ndb/src/common/logger/CMakeLists.txt@1.1, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +24 -0 New BitKeeper file ``ndb/src/common/logger/CMakeLists.txt''
ndb/src/common/logger/CMakeLists.txt@1.0, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/common/logger/Logger.cpp@1.15, 2007-08-09 01:26:04-07:00, antony@pcg5ppc.xiphis.org +1 -1 snprintf() --> BaseString::snprintf()
ndb/src/common/mgmcommon/CMakeLists.txt@1.1, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +25 -0 New BitKeeper file ``ndb/src/common/mgmcommon/CMakeLists.txt''
ndb/src/common/mgmcommon/CMakeLists.txt@1.0, 2007-08-09 01:26:16-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/common/portlib/CMakeLists.txt@1.1, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +41 -0 New BitKeeper file ``ndb/src/common/portlib/CMakeLists.txt''
ndb/src/common/portlib/CMakeLists.txt@1.0, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/common/portlib/NdbCondition.c@1.9, 2007-08-09 01:26:04-07:00, antony@pcg5ppc.xiphis.org +108 -1 roll in code for windows
ndb/src/common/portlib/NdbConfig.c@1.19, 2007-08-09 01:26:04-07:00, antony@pcg5ppc.xiphis.org +2 -1 getpid() --> NdbHost_GetProcessId()
ndb/src/common/portlib/NdbDaemon.c@1.13, 2007-08-09 01:26:04-07:00, antony@pcg5ppc.xiphis.org +31 -13 edits for Windows
ndb/src/common/portlib/NdbHost.c@1.5, 2007-08-09 01:26:04-07:00, antony@pcg5ppc.xiphis.org +27 -0 edits for Windows
ndb/src/common/portlib/NdbMutex.c@1.11, 2007-08-09 01:26:05-07:00, antony@pcg5ppc.xiphis.org +24 -0 edits for Windows
ndb/src/common/portlib/NdbPortLibTest.cpp@1.7, 2007-08-09 01:26:05-07:00, antony@pcg5ppc.xiphis.org +2 -2 MSVC++ has stricter type checks
ndb/src/common/portlib/NdbSleep.c@1.8, 2007-08-09 01:26:05-07:00, antony@pcg5ppc.xiphis.org +4 -0 edits for Windows
ndb/src/common/portlib/NdbTCP.cpp@1.15, 2007-08-09 01:26:05-07:00, antony@pcg5ppc.xiphis.org +0 -2 edits for Windows
ndb/src/common/portlib/NdbThread.c@1.27, 2007-08-09 01:26:05-07:00, antony@pcg5ppc.xiphis.org +67 -2 edits for Windows
ndb/src/common/portlib/NdbTick.c@1.9, 2007-08-09 01:26:05-07:00, antony@pcg5ppc.xiphis.org +21 -1 edits for Windows
ndb/src/common/transporter/CMakeLists.txt@1.1, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +28 -0 New BitKeeper file ``ndb/src/common/transporter/CMakeLists.txt''
ndb/src/common/transporter/CMakeLists.txt@1.0, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/common/util/CMakeLists.txt@1.1, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +50 -0 New BitKeeper file ``ndb/src/common/util/CMakeLists.txt''
ndb/src/common/util/CMakeLists.txt@1.0, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/common/util/Properties.cpp@1.14, 2007-08-09 01:26:05-07:00, antony@pcg5ppc.xiphis.org +1 -1 MSVC++ has stricter type casting
ndb/src/common/util/SocketClient.cpp@1.13, 2007-08-09 01:26:06-07:00, antony@pcg5ppc.xiphis.org +15 -1 edits for Windows
ndb/src/common/util/basestring_vsnprintf.c@1.13, 2007-08-09 01:26:06-07:00, antony@pcg5ppc.xiphis.org +4 -0 edits for Windows
ndb/src/kernel/CMakeLists.txt@1.1, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +75 -0 New BitKeeper file ``ndb/src/kernel/CMakeLists.txt''
ndb/src/kernel/CMakeLists.txt@1.0, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/CMakeLists.txt@1.1, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +32 -0 New BitKeeper file ``ndb/src/kernel/blocks/CMakeLists.txt''
ndb/src/kernel/blocks/CMakeLists.txt@1.0, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/backup/Backup.hpp@1.16, 2007-08-09 01:26:06-07:00, antony@pcg5ppc.xiphis.org +1 -0 pick up values from ndb_global.h first
ndb/src/kernel/blocks/backup/CMakeLists.txt@1.1, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +20 -0 New BitKeeper file ``ndb/src/kernel/blocks/backup/CMakeLists.txt''
ndb/src/kernel/blocks/backup/CMakeLists.txt@1.0, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/cmvmi/CMakeLists.txt@1.1, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +20 -0 New BitKeeper file ``ndb/src/kernel/blocks/cmvmi/CMakeLists.txt''
ndb/src/kernel/blocks/cmvmi/CMakeLists.txt@1.0, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/dbacc/CMakeLists.txt@1.1, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +21 -0 New BitKeeper file ``ndb/src/kernel/blocks/dbacc/CMakeLists.txt''
ndb/src/kernel/blocks/dbacc/CMakeLists.txt@1.0, 2007-08-09 01:26:15-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/dbdict/CMakeLists.txt@1.1, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +30 -0 New BitKeeper file ``ndb/src/kernel/blocks/dbdict/CMakeLists.txt''
ndb/src/kernel/blocks/dbdict/CMakeLists.txt@1.0, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.85, 2007-08-09 01:26:06-07:00, antony@pcg5ppc.xiphis.org +1 -1 snprintf() --> BaseString::snprintf()
ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp@1.14, 2007-08-09 01:26:06-07:00, antony@pcg5ppc.xiphis.org +10 -0 edits for Windows
ndb/src/kernel/blocks/dbdih/CMakeLists.txt@1.1, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +28 -0 New BitKeeper file ``ndb/src/kernel/blocks/dbdih/CMakeLists.txt''
ndb/src/kernel/blocks/dbdih/CMakeLists.txt@1.0, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.21, 2007-08-09 01:26:07-07:00, antony@pcg5ppc.xiphis.org +1 -0 pick up values from ndb_global.h first
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.74, 2007-08-09 01:26:07-07:00, antony@pcg5ppc.xiphis.org +3 -2 pick up values from ndb_global.h first snprintf() --> BaseString::snprintf()
ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp@1.6, 2007-08-09 01:26:07-07:00, antony@pcg5ppc.xiphis.org +10 -0 edits for Windows
ndb/src/kernel/blocks/dblqh/CMakeLists.txt@1.1, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +28 -0 New BitKeeper file ``ndb/src/kernel/blocks/dblqh/CMakeLists.txt''
ndb/src/kernel/blocks/dblqh/CMakeLists.txt@1.0, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/dbtc/CMakeLists.txt@1.1, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +21 -0 New BitKeeper file ``ndb/src/kernel/blocks/dbtc/CMakeLists.txt''
ndb/src/kernel/blocks/dbtc/CMakeLists.txt@1.0, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.46, 2007-08-09 01:26:07-07:00, antony@pcg5ppc.xiphis.org +1 -0 pick up values from ndb_global.h first
ndb/src/kernel/blocks/dbtup/CMakeLists.txt@1.1, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +38 -0 New BitKeeper file ``ndb/src/kernel/blocks/dbtup/CMakeLists.txt''
ndb/src/kernel/blocks/dbtup/CMakeLists.txt@1.0, 2007-08-09 01:26:14-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/dbtux/CMakeLists.txt@1.1, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +30 -0 New BitKeeper file ``ndb/src/kernel/blocks/dbtux/CMakeLists.txt''
ndb/src/kernel/blocks/dbtux/CMakeLists.txt@1.0, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/dbtux/Dbtux.hpp@1.45, 2007-08-09 01:26:07-07:00, antony@pcg5ppc.xiphis.org +1 -0 pick up values from ndb_global.h first
ndb/src/kernel/blocks/dbutil/CMakeLists.txt@1.1, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +20 -0 New BitKeeper file ``ndb/src/kernel/blocks/dbutil/CMakeLists.txt''
ndb/src/kernel/blocks/dbutil/CMakeLists.txt@1.0, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/ndbcntr/CMakeLists.txt@1.1, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +22 -0 New BitKeeper file ``ndb/src/kernel/blocks/ndbcntr/CMakeLists.txt''
ndb/src/kernel/blocks/ndbcntr/CMakeLists.txt@1.0, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp@1.23, 2007-08-09 01:26:07-07:00, antony@pcg5ppc.xiphis.org +10 -1 edits for Windows
ndb/src/kernel/blocks/ndbfs/CMakeLists.txt@1.1, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +24 -0 New BitKeeper file ``ndb/src/kernel/blocks/ndbfs/CMakeLists.txt''
ndb/src/kernel/blocks/ndbfs/CMakeLists.txt@1.0, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/qmgr/CMakeLists.txt@1.1, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +20 -0 New BitKeeper file ``ndb/src/kernel/blocks/qmgr/CMakeLists.txt''
ndb/src/kernel/blocks/qmgr/CMakeLists.txt@1.0, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/suma/CMakeLists.txt@1.1, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +20 -0 New BitKeeper file ``ndb/src/kernel/blocks/suma/CMakeLists.txt''
ndb/src/kernel/blocks/suma/CMakeLists.txt@1.0, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/blocks/suma/Suma.hpp@1.10, 2007-08-09 01:26:08-07:00, antony@pcg5ppc.xiphis.org +1 -0 pick up values from ndb_global.h first
ndb/src/kernel/blocks/trix/CMakeLists.txt@1.1, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +20 -0 New BitKeeper file ``ndb/src/kernel/blocks/trix/CMakeLists.txt''
ndb/src/kernel/blocks/trix/CMakeLists.txt@1.0, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/error/CMakeLists.txt@1.1, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +22 -0 New BitKeeper file ``ndb/src/kernel/error/CMakeLists.txt''
ndb/src/kernel/error/CMakeLists.txt@1.0, 2007-08-09 01:26:13-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/main.cpp@1.63, 2007-08-09 01:26:06-07:00, antony@pcg5ppc.xiphis.org +3 -0 edits for Windows
ndb/src/kernel/vm/CMakeLists.txt@1.1, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +35 -0 New BitKeeper file ``ndb/src/kernel/vm/CMakeLists.txt''
ndb/src/kernel/vm/CMakeLists.txt@1.0, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/kernel/vm/Emulator.cpp@1.22, 2007-08-09 01:26:08-07:00, antony@pcg5ppc.xiphis.org +2 -0 edits for Windows
ndb/src/kernel/vm/MetaData.hpp@1.8, 2007-08-09 01:26:08-07:00, antony@pcg5ppc.xiphis.org +1 -0 pick up values from ndb_global.h first
ndb/src/kernel/vm/SimulatedBlock.cpp@1.29, 2007-08-09 01:26:08-07:00, antony@pcg5ppc.xiphis.org +1 -1 snprintf() --> BaseString::snprintf()
ndb/src/kernel/vm/TransporterCallback.cpp@1.16, 2007-08-09 01:26:08-07:00, antony@pcg5ppc.xiphis.org +3 -3 snprintf() --> BaseString::snprintf()
ndb/src/kernel/vm/WatchDog.cpp@1.8, 2007-08-09 01:26:08-07:00, antony@pcg5ppc.xiphis.org +4 -0 edits for Windows
ndb/src/mgmapi/CMakeLists.txt@1.1, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +25 -0 New BitKeeper file ``ndb/src/mgmapi/CMakeLists.txt''
ndb/src/mgmapi/CMakeLists.txt@1.0, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/mgmapi/LocalConfig.cpp@1.26, 2007-08-09 01:26:09-07:00, antony@pcg5ppc.xiphis.org +1 -1 snprintf() --> BaseString::snprintf()
ndb/src/mgmapi/ndb_logevent.cpp@1.11, 2007-08-09 01:26:09-07:00, antony@pcg5ppc.xiphis.org +16 -0 edits for Windows
ndb/src/mgmclient/CMakeLists.txt@1.1, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +34 -0 New BitKeeper file ``ndb/src/mgmclient/CMakeLists.txt''
ndb/src/mgmclient/CMakeLists.txt@1.0, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/mgmclient/CommandInterpreter.cpp@1.77, 2007-08-09 01:26:09-07:00, antony@pcg5ppc.xiphis.org +12 -0 edits for Windows
ndb/src/mgmclient/main.cpp@1.26, 2007-08-09 01:26:09-07:00, antony@pcg5ppc.xiphis.org +4 -0 edits for Windows
ndb/src/mgmsrv/CMakeLists.txt@1.1, 2007-08-09 01:26:10-07:00, antony@pcg5ppc.xiphis.org +42 -0 New BitKeeper file ``ndb/src/mgmsrv/CMakeLists.txt''
ndb/src/mgmsrv/CMakeLists.txt@1.0, 2007-08-09 01:26:10-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/src/mgmsrv/MgmtSrvr.cpp@1.118, 2007-08-09 01:26:09-07:00, antony@pcg5ppc.xiphis.org +1 -1 snprintf() --> BaseString::snprintf()
ndb/src/mgmsrv/main.cpp@1.52, 2007-08-09 01:26:09-07:00, antony@pcg5ppc.xiphis.org +10 -0 edits for Windows
ndb/src/ndbapi/CMakeLists.txt@1.1, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +53 -0 New BitKeeper file ``ndb/src/ndbapi/CMakeLists.txt''
ndb/src/ndbapi/CMakeLists.txt@1.0, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/test/CMakeLists.txt@1.1, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +19 -0 New BitKeeper file ``ndb/test/CMakeLists.txt''
ndb/test/CMakeLists.txt@1.0, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/test/ndbapi/CMakeLists.txt@1.1, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +70 -0 New BitKeeper file ``ndb/test/ndbapi/CMakeLists.txt''
ndb/test/ndbapi/CMakeLists.txt@1.0, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/test/ndbapi/bank/CMakeLists.txt@1.1, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +34 -0 New BitKeeper file ``ndb/test/ndbapi/bank/CMakeLists.txt''
ndb/test/ndbapi/bank/CMakeLists.txt@1.0, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/test/ndbapi/old_dirs/flexBench/CMakeLists.txt@1.1, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +21 -0 New BitKeeper file ``ndb/test/ndbapi/old_dirs/flexBench/CMakeLists.txt''
ndb/test/ndbapi/old_dirs/flexBench/CMakeLists.txt@1.0, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/test/src/CMakeLists.txt@1.1, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +45 -0 New BitKeeper file ``ndb/test/src/CMakeLists.txt''
ndb/test/src/CMakeLists.txt@1.0, 2007-08-09 01:26:11-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/test/tools/CMakeLists.txt@1.1, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +33 -0 New BitKeeper file ``ndb/test/tools/CMakeLists.txt''
ndb/test/tools/CMakeLists.txt@1.0, 2007-08-09 01:26:12-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/tools/CMakeLists.txt@1.1, 2007-08-09 01:26:10-07:00, antony@pcg5ppc.xiphis.org +69 -0 New BitKeeper file ``ndb/tools/CMakeLists.txt''
ndb/tools/CMakeLists.txt@1.0, 2007-08-09 01:26:10-07:00, antony@pcg5ppc.xiphis.org +0 -0
ndb/tools/ndb_config.cpp@1.24, 2007-08-09 01:26:09-07:00, antony@pcg5ppc.xiphis.org +4 -0 define strncasecmp() for windows
sql/CMakeLists.txt@1.7, 2007-08-09 01:26:10-07:00, antony@pcg5ppc.xiphis.org +13 -2 Include NDBCluster storage engine into build
sql/ha_ndbcluster.cc@1.316, 2007-08-09 01:26:10-07:00, antony@pcg5ppc.xiphis.org +18 -36 MSVC++ has stricter type checks.
# This is a BitKeeper patch. What follows are the unified diffs for the # set of deltas contained in the patch. The rest of the patch, the part # that BitKeeper cares about, is below these diffs. # User: antony # Host: pcg5ppc.xiphis.org # Root: /private/Network/Servers/anubis.xiphis.org/home/antony/work/ndb-5.0
Index: main/extra/perror.c
- main.orig/extra/perror.c 2007-08-13 11:11:50.667197944 +1000 +++ main/extra/perror.c 2007-08-13 11:17:37.510963444 +1000 @@ -17,6 +17,9 @@
#define PERROR_VERSION "2.10"
+#ifdef HAVE_NDBCLUSTER_DB
+#include <ndb_global.h>
+#endif
#include#include #include
Index: main/include/config-win.h
- main.orig/include/config-win.h 2007-08-13 11:11:50.683198856 +1000 +++ main/include/config-win.h 2007-08-13 11:17:37.514963672 +1000 @@ -153,7 +153,11 @@ typedef uint rf_SetTimer;
#define Socket_defined #define my_socket SOCKET
+#ifndef __cplusplus
#define bool BOOL
+#define true ((BOOL)1)
+#define false ((BOOL)0)
+#endif
#define SIGPIPE SIGINT #define RETQSORTTYPE void #define QSORT_TYPE_IS_VOID
@@ -172,6 +176,7 @@ typedef uint rf_SetTimer;
#endif #define VOID_SIGHANDLER #define SIZEOF_CHAR 1@@ -0,0 +1,96 @@
+#define SIZEOF_INT 4
#define SIZEOF_LONG 4 #define SIZEOF_LONG_LONG 8 #define SIZEOF_OFF_T 8 Index: main/config.cmake =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ main/config.cmake 2007-08-13 11:17:37.858983277 +1000
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ FILE(READ "configure.in" CONFIGURE_IN)
+
+ STRING(REGEX REPLACE ".*AM_INIT_AUTOMAKE\\(mysql, ([^)]+)\\).*"
+ "\\1" PARSE_VERSION "${CONFIGURE_IN}")
+
+ STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)"
+ "\\1.\\2" PARSE_BASE_VERSION "${VERSION}")
+ STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)"
+ "\\1" PARSE_VERSION_MAJOR "${VERSION}")
+ STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)"
+ "\\2" PARSE_VERSION_MINOR "${VERSION}")
+ STRING(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)"
+ "\\3" PARSE_VERSION_BUILD "${VERSION}")
+ IF(PARSE_VERSION_MINOR LESS 10)
+ SET(PARSE_VERSION_ID "${PARSE_VERSION_MAJOR}0${PARSE_VERSION_MINOR}")
+ ELSE(PARSE_VERSION_MINOR LESS 10)
+ SET(PARSE_VERSION_ID "${PARSE_VERSION_MAJOR}${PARSE_VERSION_MINOR}")
+ ENDIF(PARSE_VERSION_MINOR LESS 10)
+ IF(PARSE_VERSION_BUILD LESS 10)
+ SET(PARSE_VERSION_ID "${PARSE_VERSION_ID}0${PARSE_VERSION_BUILD}")
+ ELSE(PARSE_VERSION_BUILD LESS 10)
+ SET(PARSE_VERSION_ID "${PARSE_VERSION_ID}${PARSE_VERSION_BUILD}")
+ ENDIF(PARSE_VERSION_BUILD LESS 10)
+
+ STRING(REGEX REPLACE ".*PROTOCOL_VERSION=([0-9]+).*"
+ "\\1" PARSE_PROTOCOL "${CONFIGURE_IN}")
+ STRING(REGEX REPLACE ".*DOT_FRM_VERSION=([0-9]+).*"
+ "\\1" PARSE_FRM_VERSION "${CONFIGURE_IN}")
+ STRING(REGEX REPLACE ".*MYSQL_TCP_PORT_DEFAULT=([0-9]+).*"
+ "\\1" PARSE_TCP_PORT "${CONFIGURE_IN}")
+ STRING(REGEX REPLACE ".*MYSQL_UNIX_ADDR_DEFAULT=([^\r\n]+).*"
+ "\\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(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(WITH_PARTITION_STORAGE_ENGINE FALSE CACHE BOOL "Include Partitioning")
+
+ SET(NDB_SCI_INCLUDES "" CACHE STRING "")
+ SET(NDB_SCI_LIBS "" CACHE STRING "")
+ SET(NDB_TEST TRUE CACHE BOOL "Include the NDB Cluster ndbapi test programs")
+ SET(ndb_port "1186" CACHE STRING "Port for NDB Cluster management server")
+ SET(ndb_port_base "default" CACHE STRING "Base port for NDB Cluster transporters")
+ SET(NDB_VERSION_MAJOR "${PARSE_VERSION_MAJOR}" CACHE STRING "NDB Major Version" FORCE)
+ SET(NDB_VERSION_MINOR "${PARSE_VERSION_MINOR}" CACHE STRING "NDB Minor Version" FORCE)
+ SET(NDB_VERSION_BUILD "${PARSE_VERSION_BUILD}" CACHE STRING "NDB Build Version" FORCE)
+
Index: main/ndb/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/CMakeLists.txt 2007-08-13 11:17:37.910986240 +1000
@@ -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(include)
+ ADD_SUBDIRECTORY(src)
+ ADD_SUBDIRECTORY(tools)
+ IF(NDB_TEST)
+ ADD_SUBDIRECTORY(test)
+ ENDIF(NDB_TEST)
+ ADD_SUBDIRECTORY(docs)
+
Index: main/ndb/config/type_kernel.cmake
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/config/type_kernel.cmake 2007-08-13 11:17:37.934987608 +1000
@@ -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}/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/ndb/include
+ ${CMAKE_SOURCE_DIR}/ndb/src/kernel/vm
+ ${CMAKE_SOURCE_DIR}/ndb/src/kernel/error
+ ${CMAKE_SOURCE_DIR}/ndb/src/kernel
+ ${CMAKE_SOURCE_DIR}/ndb/include/kernel
+ ${CMAKE_SOURCE_DIR}/ndb/include/transporter
+ ${CMAKE_SOURCE_DIR}/ndb/include/debugger
+ ${CMAKE_SOURCE_DIR}/ndb/include/mgmapi
+ ${CMAKE_SOURCE_DIR}/ndb/include/mgmcommon
+ ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi
+ ${CMAKE_SOURCE_DIR}/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/ndb/include/logger)
+
+
Index: main/ndb/config/type_mgmapiclient.cmake
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/config/type_mgmapiclient.cmake 2007-08-13 11:17:37.954988748 +1000
@@ -0,0 +1,17 @@
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}//ndb/include/mgmapi)
+
Index: main/ndb/config/type_ndbapi.cmake
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/config/type_ndbapi.cmake 2007-08-13 11:17:37.978990115 +1000
@@ -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_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_BINARY_DIR}/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/mysys
+ ${CMAKE_SOURCE_DIR}/ndb/include
+ ${CMAKE_SOURCE_DIR}/ndb/include/kernel
+ ${CMAKE_SOURCE_DIR}/ndb/include/transporter
+ ${CMAKE_SOURCE_DIR}/ndb/include/debugger
+ ${CMAKE_SOURCE_DIR}/ndb/include/mgmapi
+ ${CMAKE_SOURCE_DIR}/ndb/include/mgmcommon
+ ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi
+ ${CMAKE_SOURCE_DIR}/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/ndb/include/logger)
+
Index: main/ndb/config/type_ndbapiclient.cmake
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/config/type_ndbapiclient.cmake 2007-08-13 11:17:38.058994675 +1000
@@ -0,0 +1,17 @@
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/include/ndbapi)
+
Index: main/ndb/config/type_ndbapitest.cmake
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/config/type_ndbapitest.cmake 2007-08-13 11:17:38.098996954 +1000
@@ -0,0 +1,33 @@
+ # 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})
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_BINARY_DIR}/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/ndb/include
+ ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi
+ ${CMAKE_SOURCE_DIR}/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/ndb/test/include
+ ${CMAKE_SOURCE_DIR}/ndb/include/mgmapi)
+
Index: main/ndb/config/type_ndbapitools.cmake
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/config/type_ndbapitools.cmake 2007-08-13 11:17:38.155000146 +1000
@@ -0,0 +1,34 @@
+ # 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}
+ wsock32)
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_BINARY_DIR}/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/ndb/include
+ ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi
+ ${CMAKE_SOURCE_DIR}/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/ndb/test/include
+ ${CMAKE_SOURCE_DIR}/ndb/include/mgmapi
+ ${CMAKE_SOURCE_DIR}/ndb/include/kernel)
+
Index: main/ndb/config/type_util.cmake
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/config/type_util.cmake 2007-08-13 11:17:38.235004705 +1000
@@ -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_CURRENT_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_BINARY_DIR}/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/mysys
+ ${CMAKE_SOURCE_DIR}/ndb/include
+ ${CMAKE_SOURCE_DIR}/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/ndb/include/logger)
+
Index: main/ndb/include/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/include/CMakeLists.txt 2007-08-13 11:17:38.303008580 +1000
@@ -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(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)
+
Index: main/ndb/src/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/CMakeLists.txt 2007-08-13 11:17:38.391013595 +1000
@@ -0,0 +1,68 @@
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ ADD_SUBDIRECTORY(common)
+ ADD_SUBDIRECTORY(mgmapi)
+ ADD_SUBDIRECTORY(ndbapi)
+ ADD_SUBDIRECTORY(kernel)
+ ADD_SUBDIRECTORY(mgmclient)
+ ADD_SUBDIRECTORY(mgmsrv)
+ ADD_SUBDIRECTORY(cw)
+
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+
+ IF(WIN32)
+ FILE(WRITE ${CMAKE_CURRENT_SOURCE_DIR}/dummy.cpp "")
+ SET_SOURCE_FILES_PROPERTIES(dummy.cpp PROPERTIES GENERATED TRUE)
+ ADD_LIBRARY(ndbclient STATIC dummy.cpp)
+ ADD_CUSTOM_COMMAND(TARGET ndbclient
+ POST_BUILD
+ COMMAND "LIB"
+ "/OUT:${CMAKE_CURRENT_BINARY_DIR}/ndbclient.lib"
+ "${CMAKE_CURRENT_BINARY_DIR}/ndbapi/ndbapi.lib"
+ "${CMAKE_CURRENT_BINARY_DIR}/common/transporter/ndbtransport.lib"
+ "${CMAKE_CURRENT_BINARY_DIR}/common/debugger/ndbtrace.lib"
+ "${CMAKE_CURRENT_BINARY_DIR}/common/debugger/signaldata/ndbsignaldata.lib"
+ "${CMAKE_CURRENT_BINARY_DIR}/mgmapi/ndbmgmapi.lib"
+ "${CMAKE_CURRENT_BINARY_DIR}/common/mgmcommon/ndbmgmsrv.lib"
+ "${CMAKE_CURRENT_BINARY_DIR}/common/logger/ndblogger.lib"
+ "${CMAKE_CURRENT_BINARY_DIR}/common/portlib/ndbportlib.lib"
+ "${CMAKE_CURRENT_BINARY_DIR}/common/util/ndbgeneral.lib")
+ ADD_DEPENDENCIES(ndbclient
+ ndbapi
+ ndbtransport
+ ndbtrace
+ ndbsignaldata
+ ndbmgmapi
+ ndbmgmsrv
+ ndblogger
+ ndbportlib
+ ndbgeneral)
+
+ ELSE(WIN32)
+ ADD_LIBRARY(ndbclient SHARED dll.cpp)
+ TARGET_LINK_LIBRARIES(ndbclient
+ ndbapi
+ ndbtransport
+ ndbtrace
+ ndbsignaldata
+ ndbmgmapi
+ ndbmgmsrv
+ ndblogger
+ ndbportlib
+ ndbgeneral)
+ ENDIF(WIN32)
+
Index: main/ndb/src/common/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/common/CMakeLists.txt 2007-08-13 11:17:38.447016787 +1000
@@ -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
+
+
+ ADD_SUBDIRECTORY(portlib)
+ ADD_SUBDIRECTORY(debugger)
+ ADD_SUBDIRECTORY(util)
+ ADD_SUBDIRECTORY(logger)
+ ADD_SUBDIRECTORY(transporter)
+ ADD_SUBDIRECTORY(mgmcommon)
+
+
Index: main/ndb/src/common/debugger/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/common/debugger/CMakeLists.txt 2007-08-13 11:17:38.507020206 +1000
@@ -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
+
+
+ ADD_SUBDIRECTORY(signaldata)
+
+ INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake)
+
+ ADD_LIBRARY(ndbtrace STATIC
+ SignalLoggerManager.cpp
+ DebuggerNames.cpp
+ BlockNames.cpp
+ EventLogger.cpp
+ GrepError.cpp)
+
+
Index: main/ndb/src/common/debugger/signaldata/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/common/debugger/signaldata/CMakeLists.txt 2007-08-13 11:17:38.571023853 +1000
@@ -0,0 +1,44 @@
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapi.cmake)
+
+ ADD_LIBRARY(ndbsignaldata STATIC
+ TcKeyReq.cpp TcKeyConf.cpp TcKeyRef.cpp
+ TcRollbackRep.cpp
+ TupKey.cpp TupCommit.cpp LqhKey.cpp
+ FsOpenReq.cpp FsCloseReq.cpp FsRef.cpp FsConf.cpp FsReadWriteReq.cpp
+ SignalDataPrint.cpp SignalNames.cpp
+ ContinueB.cpp DihContinueB.cpp NdbfsContinueB.cpp
+ CloseComReqConf.cpp PackedSignal.cpp PrepFailReqRef.cpp
+ GCPSave.cpp DictTabInfo.cpp
+ AlterTable.cpp AlterTab.cpp
+ CreateTrig.cpp AlterTrig.cpp DropTrig.cpp
+ FireTrigOrd.cpp TrigAttrInfo.cpp
+ CreateIndx.cpp AlterIndx.cpp DropIndx.cpp TcIndx.cpp
+ IndxKeyInfo.cpp IndxAttrInfo.cpp
+ FsAppendReq.cpp ScanTab.cpp
+ BackupImpl.cpp BackupSignalData.cpp
+ UtilSequence.cpp UtilPrepare.cpp UtilDelete.cpp UtilExecute.cpp
+ LqhFrag.cpp DropTab.cpp PrepDropTab.cpp LCP.cpp MasterLCP.cpp
+ CopyGCI.cpp SystemError.cpp StartRec.cpp NFCompleteRep.cpp
+ FailRep.cpp DisconnectRep.cpp SignalDroppedRep.cpp
+ SumaImpl.cpp NdbSttor.cpp CreateFragmentation.cpp
+ UtilLock.cpp TuxMaint.cpp AccLock.cpp
+ LqhTrans.cpp ReadNodesConf.cpp CntrStart.cpp
+ ScanFrag.cpp )
+
+
Index: main/ndb/src/common/logger/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/common/logger/CMakeLists.txt 2007-08-13 11:17:38.623026817 +1000
@@ -0,0 +1,25 @@
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapi.cmake)
+
+ ADD_LIBRARY(ndblogger STATIC
+ Logger.cpp
+ LogHandlerList.cpp
+ LogHandler.cpp
+ ConsoleLogHandler.cpp
+ FileLogHandler.cpp)
+
Index: main/ndb/src/common/mgmcommon/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/common/mgmcommon/CMakeLists.txt 2007-08-13 11:17:38.647028185 +1000
@@ -0,0 +1,26 @@
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/src/mgmapi
+ ${CMAKE_SOURCE_DIR}/ndb/src/mgmsrv)
+ INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_ndbapi.cmake)
+ INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_mgmapiclient.cmake)
+
+ ADD_LIBRARY(ndbmgmsrv STATIC
+ ConfigRetriever.cpp
+ IPCConfig.cpp)
+
+
Index: main/ndb/src/common/portlib/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/common/portlib/CMakeLists.txt 2007-08-13 11:17:38.703031376 +1000
@@ -0,0 +1,42 @@
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ INCLUDE(${CMAKE_BINARY_DIR}/ndb/config/type_util.cmake)
+
+ IF(WIN32)
+ ADD_DEFINITIONS(-D_WIN32_WINNT=0x400)
+ ENDIF(WIN32)
+
+ ADD_LIBRARY(ndbportlib STATIC
+ NdbCondition.c NdbMutex.c NdbSleep.c NdbTick.c
+ NdbEnv.c NdbThread.c NdbHost.c NdbTCP.cpp
+ NdbDaemon.c NdbMem.c
+ NdbConfig.c)
+
+ # win32/NdbCondition.c win32/NdbDaemon.c win32/NdbEnv.c
+ # win32/NdbHost.c win32/NdbMem.c win32/NdbMutex.c
+ # win32/NdbSleep.c win32/NdbTCP.c win32/NdbThread.c
+ # win32/NdbTick.c)
+
+ #ADD_EXECUTABLE(memtest memtest.c)
+ #TARGET_LINK_LIBRARIES(memtest ndbportlib wsock32)
+
+ #ADD_EXECUTABLE(PortLibTest NdbPortLibTest.cpp)
+ #TARGET_LINK_LIBRARIES(PortLibTest ndbportlib wsock32)
+
+ #ADD_EXECUTABLE(munmaptest munmaptest.cpp)
+ #TARGET_LINK_LIBRARIES(munmaptest ndbportlib wsock32)
+
Index: main/ndb/src/common/transporter/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/common/transporter/CMakeLists.txt 2007-08-13 11:17:38.723032516 +1000
@@ -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}/ndb/config/type_util.cmake)
+ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/include/mgmapi
+ ${CMAKE_SOURCE_DIR}/ndb/src/mgmapi
+ ${CMAKE_SOURCE_DIR}/ndb/include/debugger
+ ${CMAKE_SOURCE_DIR}/ndb/include/kernel
+ ${CMAKE_SOURCE_DIR}/ndb/include/transporter
+ ${NDB_SCI_INCLUDES})
+
+ ADD_LIBRARY(ndbtransport STATIC
+ Transporter.cpp SendBuffer.cpp TCP_Transporter.cpp
+ TransporterRegistry.cpp Packer.cpp)
+
+
Index: main/ndb/src/common/util/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/common/util/CMakeLists.txt 2007-08-13 11:17:38.747033884 +1000
@@ -0,0 +1,51 @@
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_BINARY_DIR}/ndb/include
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/mysys
+ ${CMAKE_SOURCE_DIR}/ndb/include
+ ${CMAKE_SOURCE_DIR}/ndb/include/util
+ ${CMAKE_SOURCE_DIR}/ndb/include/portlib
+ ${CMAKE_SOURCE_DIR}/ndb/include/logger)
+
+ ADD_LIBRARY(ndbgeneral STATIC
+ File.cpp
+ md5_hash.cpp
+ Properties.cpp
+ socket_io.cpp
+ SimpleProperties.cpp
+ Parser.cpp
+ InputStream.cpp
+ SocketServer.cpp
+ SocketClient.cpp
+ SocketAuthenticator.cpp
+ OutputStream.cpp
+ NdbOut.cpp
+ BaseString.cpp
+ NdbSqlUtil.cpp
+ new.cpp
+ uucode.c
+ random.c
+ version.c
+ strdup.c
+ ConfigValues.cpp
+ ndb_init.c
+ basestring_vsnprintf.c
+ Bitmask.cpp)
+
Index: main/ndb/src/kernel/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/kernel/CMakeLists.txt 2007-08-13 11:17:38.779035707 +1000
@@ -0,0 +1,76 @@
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ ADD_SUBDIRECTORY(error)
+ ADD_SUBDIRECTORY(blocks)
+ ADD_SUBDIRECTORY(vm)
+
+ INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake)
+
+ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/blocks/cmvmi
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbacc
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbdict
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbdih
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dblqh
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbtc
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbtup
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/ndbfs
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/ndbcntr
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/qmgr
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/trix
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/backup
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbutil
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/suma
+ ${CMAKE_CURRENT_SOURCE_DIR}/blocks/dbtux)
+
+
+ ADD_EXECUTABLE(ndbd
+ main.cpp
+ SimBlockList.cpp)
+
+ TARGET_LINK_LIBRARIES(ndbd
+ ndbcmvmi
+ ndbdbacc
+ ndbdbdict
+ ndbdbdih
+ ndbdblqh
+ ndbdbtc
+ ndbdbtup
+ ndbndbfs
+ ndbndbcntr
+ ndbqmgr
+ ndbtrix
+ ndbbackup
+ ndbdbutil
+ ndbsuma
+ ndbdbtux
+ ndbkernel
+ ndberror
+ ndbtransport
+ ndbtrace
+ ndbsignaldata
+ ndblogger
+ ndbmgmsrv
+ ndbmgmapi
+ ndbportlib
+ ndbgeneral
+ dbug
+ mysys
+ strings
+ ${NDB_SCI_LIBS}
+ wsock32)
+
+
Index: main/ndb/src/kernel/blocks/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/kernel/blocks/CMakeLists.txt 2007-08-13 11:17:38.811037531 +1000
@@ -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
+
+
+ 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)
+
+
Index: main/ndb/src/kernel/blocks/backup/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/kernel/blocks/backup/CMakeLists.txt 2007-08-13 11:17:38.843039355 +1000
@@ -0,0 +1,21 @@
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake)
+
+ ADD_LIBRARY(ndbbackup STATIC
+ Backup.cpp BackupInit.cpp)
+
Index: main/ndb/src/kernel/blocks/cmvmi/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/kernel/blocks/cmvmi/CMakeLists.txt 2007-08-13 11:17:38.871040950 +1000
@@ -0,0 +1,21 @@
+ # Copyright (C) 2007 MySQL AB
+ #
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation; version 2 of the License.
+ #
+ # This program is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ # GNU General Public License for more details.
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+ INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake)
+
+ ADD_LIBRARY(ndbcmvmi STATIC
+ Cmvmi.cpp)
+
Index: main/ndb/src/kernel/blocks/dbacc/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ main/ndb/src/kernel/blocks/dbacc/CMakeLists.txt 2007-08-13 11:17:38.895042318 +1000
@@ -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_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/src/kernel/blocks/dbtup)
+ INCLUDE(${CMAKE_SOURCE_DIR}/ndb/config/type_kernel.cmake)
+
+ ADD_LIBRARY(ndbdbacc STATIC
+ DbaccInit.cpp DbaccMain.cpp)
+
Index: main/ndb/src/kernel/blocks/dbdict/CMakeLists.txt
- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ main/ndb/src/kernel/blocks/dbdict/CMakeLists.txt 2007-08-13 11:17:38.915043458 +1000 @@ -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}/ndb/config/type_kernel.cmake) + + LINK_LIBRARIES(ndbgeneral + ndbportlib + dbug + mysys + strings + wsock32) + + ADD_LIBRARY(ndbd