Pantek Library
Hosting Provided By
CybrHost
High Speed Hosting

bk commit into 5.0 tree (antony:1.2473)

From: Stewart Smith <stewart(at)mysql.com>
Date: Sun Aug 12 2007 - 20:18:35 EDT


Below is the list of changes that have just been committed into a local 5.0 repository of stewart. When stewart 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.2473, 2007-08-13 10:18:24+10:00, antony@mysql.com +48 -0   [PATCH] bk commit into 5.0 tree (antony:1.2489)   

  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   

Do you need help?X

    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''   

Do you need more help?X

    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''   

Can we help you?X

    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''   

Can't find what you're looking for?X

    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   

Don't know where to look next?X

    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   

Confused? Frustrated?X

    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   

Call Pantek today for Open Source Technical Support at 1-877-546-8934 - 24/7/365X

    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   

Do you need help?X

    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   

Do you need more help?X

    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   

Can we help you?X

    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   

Can't find what you're looking for?X

    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''   

Don't know where to look next?X

    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   

Confused? Frustrated?X

    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   

Call Pantek today for Open Source Technical Support at 1-877-546-8934 - 24/7/365X

    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()   

Do you need help?X

    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()   

Do you need more help?X

    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''   

Can we help you?X

    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''   

Can't find what you're looking for?X

    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

  CMakeLists.txt@1.14, 2007-08-09 18:26:02+10:00, antony@mysql.com +35 -20     bk commit into 5.0 tree (antony:1.2489)

  extra/CMakeLists.txt@1.6, 2007-08-09 18:26:02+10:00, antony@mysql.com +5 -0     bk commit into 5.0 tree (antony:1.2489)

  extra/perror.c@1.49, 2007-08-09 18:26:03+10:00, antony@mysql.com +3 -0     bk commit into 5.0 tree (antony:1.2489)

  include/config-win.h@1.86, 2007-08-09 18:26:03+10:00, antony@mysql.com +5 -0     bk commit into 5.0 tree (antony:1.2489)

Don't know where to look next?X

  libmysql/CMakeLists.txt@1.4, 2007-08-09 18:26:03+10:00, antony@mysql.com +2 -2     bk commit into 5.0 tree (antony:1.2489)

  ndb/include/ndb_types.h.in@1.17, 2007-08-09 18:26:03+10:00, antony@mysql.com +14 -10     bk commit into 5.0 tree (antony:1.2489)

  ndb/include/ndbapi/NdbOperation.hpp@1.38, 2007-08-09 18:26:03+10:00, antony@mysql.com +1 -1     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/debugger/signaldata/CntrStart.cpp@1.3, 2007-08-09 18:26:03+10:00, antony@mysql.com +1 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/debugger/signaldata/ReadNodesConf.cpp@1.3, 2007-08-09 18:26:04+10:00, antony@mysql.com +1 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/logger/Logger.cpp@1.15, 2007-08-09 18:26:04+10:00, antony@mysql.com +1 -1     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/portlib/NdbCondition.c@1.9, 2007-08-09 18:26:04+10:00, antony@mysql.com +108 -1     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/portlib/NdbConfig.c@1.19, 2007-08-09 18:26:04+10:00, antony@mysql.com +2 -1     bk commit into 5.0 tree (antony:1.2489)

Confused? Frustrated?X

  ndb/src/common/portlib/NdbDaemon.c@1.13, 2007-08-09 18:26:04+10:00, antony@mysql.com +31 -13     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/portlib/NdbHost.c@1.5, 2007-08-09 18:26:04+10:00, antony@mysql.com +27 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/portlib/NdbMutex.c@1.11, 2007-08-09 18:26:05+10:00, antony@mysql.com +24 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/portlib/NdbPortLibTest.cpp@1.7, 2007-08-09 18:26:05+10:00, antony@mysql.com +2 -2     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/portlib/NdbSleep.c@1.8, 2007-08-09 18:26:05+10:00, antony@mysql.com +4 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/portlib/NdbTCP.cpp@1.15, 2007-08-09 18:26:05+10:00, antony@mysql.com +0 -2     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/portlib/NdbThread.c@1.27, 2007-08-09 18:26:05+10:00, antony@mysql.com +67 -2     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/portlib/NdbTick.c@1.9, 2007-08-09 18:26:05+10:00, antony@mysql.com +21 -1     bk commit into 5.0 tree (antony:1.2489)

Call Pantek today for Open Source Technical Support at 1-877-546-8934 - 24/7/365X

  ndb/src/common/util/Properties.cpp@1.14, 2007-08-09 18:26:05+10:00, antony@mysql.com +1 -1     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/util/SocketClient.cpp@1.13, 2007-08-09 18:26:06+10:00, antony@mysql.com +15 -1     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/common/util/basestring_vsnprintf.c@1.13, 2007-08-09 18:26:06+10:00, antony@mysql.com +4 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/blocks/backup/Backup.hpp@1.16, 2007-08-09 18:26:06+10:00, antony@mysql.com +1 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp@1.85, 2007-08-09 18:26:06+10:00, antony@mysql.com +1 -1     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp@1.14, 2007-08-09 18:26:06+10:00, antony@mysql.com +10 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/blocks/dbdih/Dbdih.hpp@1.21, 2007-08-09 18:26:07+10:00, antony@mysql.com +1 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/blocks/dbdih/DbdihMain.cpp@1.74, 2007-08-09 18:26:07+10:00, antony@mysql.com +3 -2     bk commit into 5.0 tree (antony:1.2489)

Do you need help?X

  ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp@1.6, 2007-08-09 18:26:07+10:00, antony@mysql.com +10 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/blocks/dbtc/Dbtc.hpp@1.46, 2007-08-09 18:26:07+10:00, antony@mysql.com +1 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/blocks/dbtux/Dbtux.hpp@1.45, 2007-08-09 18:26:07+10:00, antony@mysql.com +1 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp@1.23, 2007-08-09 18:26:07+10:00, antony@mysql.com +10 -1     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/blocks/suma/Suma.hpp@1.10, 2007-08-09 18:26:08+10:00, antony@mysql.com +1 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/main.cpp@1.63, 2007-08-09 18:26:06+10:00, antony@mysql.com +3 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/vm/Emulator.cpp@1.22, 2007-08-09 18:26:08+10:00, antony@mysql.com +2 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/vm/MetaData.hpp@1.8, 2007-08-09 18:26:08+10:00, antony@mysql.com +1 -0     bk commit into 5.0 tree (antony:1.2489)

Do you need more help?X

  ndb/src/kernel/vm/SimulatedBlock.cpp@1.29, 2007-08-09 18:26:08+10:00, antony@mysql.com +1 -1     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/vm/TransporterCallback.cpp@1.16, 2007-08-09 18:26:08+10:00, antony@mysql.com +3 -3     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/kernel/vm/WatchDog.cpp@1.8, 2007-08-09 18:26:08+10:00, antony@mysql.com +4 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/mgmapi/LocalConfig.cpp@1.26, 2007-08-09 18:26:09+10:00, antony@mysql.com +1 -1     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/mgmapi/ndb_logevent.cpp@1.11, 2007-08-09 18:26:09+10:00, antony@mysql.com +16 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/mgmclient/CommandInterpreter.cpp@1.79, 2007-08-09 18:26:09+10:00, antony@mysql.com +12 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/mgmclient/main.cpp@1.26, 2007-08-09 18:26:09+10:00, antony@mysql.com +4 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/src/mgmsrv/MgmtSrvr.cpp@1.118, 2007-08-09 18:26:09+10:00, antony@mysql.com +1 -1     bk commit into 5.0 tree (antony:1.2489)

Can we help you?X

  ndb/src/mgmsrv/main.cpp@1.52, 2007-08-09 18:26:09+10:00, antony@mysql.com +10 -0     bk commit into 5.0 tree (antony:1.2489)

  ndb/tools/ndb_config.cpp@1.24, 2007-08-09 18:26:09+10:00, antony@mysql.com +4 -0     bk commit into 5.0 tree (antony:1.2489)

  sql/CMakeLists.txt@1.7, 2007-08-09 18:26:10+10:00, antony@mysql.com +13 -2     bk commit into 5.0 tree (antony:1.2489)

  sql/ha_ndbcluster.cc@1.315, 2007-08-09 18:26:10+10:00, antony@mysql.com +18 -36     bk commit into 5.0 tree (antony:1.2489)

# 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:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/5.0/ndb-win32

--- 1.48/extra/perror.c	2007-03-29 03:46:36 +10:00
+++ 1.49/extra/perror.c	2007-08-09 18:26:03 +10:00
@@ -17,6 +17,9 @@  

 #define PERROR_VERSION "2.10"  

+#ifdef HAVE_NDBCLUSTER_DB
+#include <ndb_global.h>
+#endif

 #include 
 #include 
 #include 

--- 1.85/include/config-win.h	2007-03-29 07:00:25 +10:00
+++ 1.86/include/config-win.h	2007-08-09 18:26:03 +10:00
@@ -153,7 +153,11 @@  
 #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 @@
 #endif
 #define VOID_SIGHANDLER
 #define SIZEOF_CHAR		1

+#define SIZEOF_INT 4
#define SIZEOF_LONG 4 #define SIZEOF_LONG_LONG 8 #define SIZEOF_OFF_T 8 --- 1.13/CMakeLists.txt 2007-05-04 17:37:49 +10:00 +++ 1.14/CMakeLists.txt 2007-08-09 18:26:02 +10:00
@@ -14,17 +14,22 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA  

 PROJECT(MySql)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)    # This reads user configuration, generated by configure.js. -INCLUDE(win/configure.data)

+INCLUDE(win/configure.data OPTIONAL)
+
+IF(NOT EXISTS win/configure.data)
Can't find what you're looking for?X
+INCLUDE(config.cmake) +ENDIF(NOT EXISTS win/configure.data) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in ${CMAKE_SOURCE_DIR}/include/mysql_version.h @ONLY)

 # Set standard options

-ADD_DEFINITIONS(-D WITH_MYISAM_STORAGE_ENGINE)
-ADD_DEFINITIONS(-D CMAKE_BUILD)
-ADD_DEFINITIONS(-D HAVE_YASSL)
+ADD_DEFINITIONS(-DWITH_MYISAM_STORAGE_ENGINE)
+ADD_DEFINITIONS(-DCMAKE_BUILD)
+ADD_DEFINITIONS(-DHAVE_YASSL)    # Set debug options
 SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DFORCE_INIT_OF_VARS") @@ -34,39 +39,46 @@    
Don't know where to look next?X

 IF(WITH_ARCHIVE_STORAGE_ENGINE)
- ADD_DEFINITIONS(-D HAVE_ARCHIVE_DB)
+ ADD_DEFINITIONS(-DHAVE_ARCHIVE_DB)
 ENDIF(WITH_ARCHIVE_STORAGE_ENGINE)    IF (WITH_HEAP_STORAGE_ENGINE)
- ADD_DEFINITIONS(-D WITH_HEAP_STORAGE_ENGINE) + ADD_DEFINITIONS(-DWITH_HEAP_STORAGE_ENGINE)    SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_heap_plugin")  ENDIF (WITH_HEAP_STORAGE_ENGINE)    IF (WITH_MYISAMMRG_STORAGE_ENGINE)
- ADD_DEFINITIONS(-D WITH_MYISAMMRG_STORAGE_ENGINE) + ADD_DEFINITIONS(-DWITH_MYISAMMRG_STORAGE_ENGINE)    SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_myisammrg_plugin")  ENDIF (WITH_MYISAMMRG_STORAGE_ENGINE)    IF(WITH_INNOBASE_STORAGE_ENGINE)

-  ADD_DEFINITIONS(-D HAVE_INNOBASE_DB)
-  ADD_DEFINITIONS(-D WITH_INNOBASE_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-DHAVE_INNOBASE_DB)
+  ADD_DEFINITIONS(-DWITH_INNOBASE_STORAGE_ENGINE)

   SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_innobase_plugin")  ENDIF(WITH_INNOBASE_STORAGE_ENGINE)  

+IF(WITH_NDBCLUSTER_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-DHAVE_NDBCLUSTER_DB)
+  ADD_DEFINITIONS(-DWITH_NDBCLUSTER_STORAGE_ENGINE)
+  SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_ndbcluster_plugin")
+  SET(WITH_PARTITION_STORAGE_ENGINE TRUE)
+ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE)
+
 IF(WITH_FEDERATED_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D HAVE_FEDERATED_DB)
-  ADD_DEFINITIONS(-D WITH_FEDERATED_STORAGE_ENGINE)
+ ADD_DEFINITIONS(-DHAVE_FEDERATED_DB)
+ ADD_DEFINITIONS(-DWITH_FEDERATED_STORAGE_ENGINE)    SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_federated_plugin")  ENDIF(WITH_FEDERATED_STORAGE_ENGINE)    IF(WITH_BERKELEY_STORAGE_ENGINE)
-  ADD_DEFINITIONS(-D HAVE_BERKELEY_DB)
-  ADD_DEFINITIONS(-D WITH_BERKELEY_STORAGE_ENGINE)
+  ADD_DEFINITIONS(-DHAVE_BERKELEY_DB)
+  ADD_DEFINITIONS(-DWITH_BERKELEY_STORAGE_ENGINE)

   SET (mysql_plugin_defs "${mysql_plugin_defs},builtin_berkeley_plugin")  ENDIF(WITH_BERKELEY_STORAGE_ENGINE)    IF (WITH_BLACKHOLE_STORAGE_ENGINE)
- ADD_DEFINITIONS(-D HAVE_BLACKHOLE_DB) + ADD_DEFINITIONS(-DHAVE_BLACKHOLE_DB)
 ENDIF (WITH_BLACKHOLE_STORAGE_ENGINE)    SET(localstatedir "C:\\mysql\\data")
@@ -82,14 +94,14 @@

                ${CMAKE_SOURCE_DIR}/support-files/my-small.ini @ONLY)
 

 IF(__NT__)
- ADD_DEFINITIONS(-D __NT__)
+ ADD_DEFINITIONS(-D__NT__)
 ENDIF(__NT__)    # in some places we use DBUG_OFF

-SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D DBUG_OFF")
-SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -D DBUG_OFF")
-SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D DBUG_OFF")
-SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -D DBUG_OFF")
+SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF")
+SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")
+SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DDBUG_OFF") +SET(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -DDBUG_OFF")    IF(CMAKE_GENERATOR MATCHES "Visual Studio 8")

     SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /wd4996") @@ -133,7 +145,7 @@
 ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 7" OR

       CMAKE_GENERATOR MATCHES "Visual Studio 8")  

-ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D _CRT_SECURE_NO_DEPRECATE") +ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_CRT_SECURE_NO_DEPRECATE")    IF(EMBED_MANIFESTS)
     # Search for the Manifest tool. CMake will first search it's defaults @@ -187,6 +199,9 @@
 IF(WITH_INNOBASE_STORAGE_ENGINE)
   ADD_SUBDIRECTORY(innobase)
 ENDIF(WITH_INNOBASE_STORAGE_ENGINE)

+IF(WITH_NDBCLUSTER_STORAGE_ENGINE)
+  ADD_SUBDIRECTORY(ndb)
+ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE)
Confused? Frustrated?X
ADD_SUBDIRECTORY(sql)

 ADD_SUBDIRECTORY(sql/examples)
 ADD_SUBDIRECTORY(server-tools/instance-manager)
  • 1.5/extra/CMakeLists.txt 2007-04-24 05:41:22 +10:00 +++ 1.6/extra/CMakeLists.txt 2007-08-09 18:26:02 +10:00 @@ -18,6 +18,11 @@ SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include)
+IF(WITH_NDBCLUSTER_STORAGE_ENGINE)
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ndb/include
+                    ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi
+                    ${CMAKE_SOURCE_DIR}/ndb/include/mgmapi)
+ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE)    ADD_EXECUTABLE(comp_err comp_err.c)
 TARGET_LINK_LIBRARIES(comp_err dbug mysys strings zlib wsock32)
  • 1.3/libmysql/CMakeLists.txt 2007-04-24 05:41:22 +10:00 +++ 1.4/libmysql/CMakeLists.txt 2007-08-09 18:26:03 +10:00 @@ -63,8 +63,8 @@ ../strings/strtoll.c ../strings/strtoull.c ../strings/strxmov.c ../strings/strxnmov.c ../mysys/thr_mutex.c ../mysys/typelib.c ../vio/vio.c ../vio/viosocket.c ../vio/viossl.c ../vio/viosslfactories.c ../strings/xml.c) -ADD_DEPENDENCIES(libmysql dbug vio mysys strings GenError zlib yassl taocrypt) -TARGET_LINK_LIBRARIES(libmysql mysys strings wsock32) +ADD_DEPENDENCIES(libmysql vio GenError) +TARGET_LINK_LIBRARIES(libmysql dbug mysys strings zlib yassl taocrypt wsock32)

 ADD_EXECUTABLE(myTest mytest.c)
 TARGET_LINK_LIBRARIES(myTest libmysql)

  • 1.6/sql/CMakeLists.txt 2007-05-16 00:30:09 +10:00 +++ 1.7/sql/CMakeLists.txt 2007-08-09 18:26:10 +10:00 @@ -28,6 +28,12 @@ ${CMAKE_SOURCE_DIR}/bdb/build_win32 ${CMAKE_SOURCE_DIR}/bdb/dbinc)
+IF(WITH_NDBCLUSTER_STORAGE_ENGINE)
+  INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/ndb/include
+                      ${CMAKE_SOURCE_DIR}/ndb/include
+                      ${CMAKE_SOURCE_DIR}/ndb/include/ndbapi)
+ENDIF(WITH_NDBCLUSTER_STORAGE_ENGINE)
+
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_SOURCE_DIR}/sql/message.rc 
 							${CMAKE_SOURCE_DIR}/sql/message.h 
 							${CMAKE_SOURCE_DIR}/sql/sql_yacc.h 
@@ -48,9 +54,10 @@  
 ADD_EXECUTABLE(mysqld ../sql-common/client.c derror.cc des_key_file.cc
                discover.cc ../libmysql/errmsg.c field.cc field_conv.cc 
-               filesort.cc gstream.cc ha_blackhole.cc 
+               filesort.cc gstream.cc
                ha_archive.cc ha_heap.cc ha_myisam.cc ha_myisammrg.cc
                ha_innodb.cc ha_federated.cc ha_berkeley.cc ha_blackhole.cc
+               ha_ndbcluster.cc ha_ndbcluster_cond.cc
                handler.cc hash_filo.cc hash_filo.h 
                hostname.cc init.cc item.cc item_buff.cc item_cmpfunc.cc 
                item_create.cc item_func.cc item_geofunc.cc item_row.cc 
@@ -97,6 +104,10 @@
Call Pantek today for Open Source Technical Support at 1-877-546-8934 - 24/7/365X

   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)
+

 IF(WITH_BERKELEY_STORAGE_ENGINE)
   TARGET_LINK_LIBRARIES(mysqld bdb)
 ENDIF(WITH_BERKELEY_STORAGE_ENGINE)
@@ -138,4 +149,4 @@  

 ADD_LIBRARY(udf_example MODULE udf_example.c udf_example.def)  ADD_DEPENDENCIES(udf_example strings)
-TARGET_LINK_LIBRARIES(udf_example wsock32) +TARGET_LINK_LIBRARIES(udf_example strings wsock32)

  • 1.2/ndb/src/common/debugger/signaldata/CntrStart.cpp 2006-12-31 10:40:58 +11:00 +++ 1.3/ndb/src/common/debugger/signaldata/CntrStart.cpp 2007-08-09 18:26:03 +10:00 @@ -13,6 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */

+#include <ndb_global.h>

 #include <signaldata/CntrStart.hpp>  

 bool

  • 1.2/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp 2006-12-31 10:40:58 +11:00 +++ 1.3/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp 2007-08-09 18:26:04 +10:00 @@ -13,6 +13,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */

+#include <ndb_global.h>

 #include <signaldata/ReadNodesConf.hpp>  

 bool

  • 1.23/ndb/tools/ndb_config.cpp 2007-01-22 23:10:38 +11:00 +++ 1.24/ndb/tools/ndb_config.cpp 2007-08-09 18:26:09 +10:00 @@ -24,7 +24,11 @@ #include <my_getopt.h> #include <mysql_version.h>

+#ifndef NDB_WIN32

 #include 

+#else
+#define strncasecmp(A,B,L) strnicmp((A),(B),(L))
+#endif
 

 #include <NdbOut.hpp>
 #include <mgmapi.h>

  • 1.16/ndb/include/ndb_types.h.in 2006-12-24 06:04:08 +11:00 +++ 1.17/ndb/include/ndb_types.h.in