Commit graph

1,124 commits

Author SHA1 Message Date
unknown
75431a2e16 fix for mysqladmin link problem
.c -> .cc
    fix source dist problem for ndb
    fix type check problem for mysqladmin



client/Makefile.am:
  fix for mysqladmin link problem
   .c -> .cc
client/mysqladmin.cc:
  fix for mysqladmin link problem
   .c -> .cc
configure.in:
  fix for mysqladmin link problem
   .c -> .cc
ndb/include/Makefile.am:
  fix source dist problem for ndb
ndb/src/mgmclient/CommandInterpreter.cpp:
  fix type check problem
ndb/src/mgmclient/ndb_mgmclient.hpp:
  fix type check problem
ndb/src/mgmclient/ndb_mgmclient.h:
  fix type check problem
2004-11-18 20:28:36 +00:00
unknown
041d153db2 Merge mysql.com:/home/jonas/src/mysql-4.1-fix
into mysql.com:/home/jonas/src/wl2077


ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  Auto merged
ndb/src/ndbapi/NdbConnection.cpp:
  Auto merged
2004-11-18 20:56:56 +01:00
unknown
6a87e0060d wl2077 moved inline to .hpp file 2004-11-18 20:54:35 +01:00
unknown
57b6bfc9cf bug#6684, error messages id wrong settings 2004-11-18 19:07:14 +00:00
unknown
22b56d2354 changed mysqladmin.c to mysqladmin.cc
no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
    aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
    removed all dependencies of LocalConfig, except for mgmapi internals
    enabled multiple management servrs to fetch data configurations from eachother


client/Makefile.am:
  changed mysqladmin.c to mysqladmin.cc
client/mysqladmin.cc:
  changed mysqladmin.c to mysqladmin.cc
configure.in:
  no need for dvlags to have DEFINE_CXA_PURE_VIRTUAL anymore
ndb/include/mgmapi/mgmapi.h:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/include/mgmcommon/ConfigRetriever.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/kernel/main.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/kernel/vm/Configuration.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
  changed to config setting to always use noOfMetaTables to make sure we don't overflow arrays
ndb/src/kernel/vm/Configuration.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/LocalConfig.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/LocalConfig.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmapi/mgmapi.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/CommandInterpreter.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/main.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/ndb_mgmclient.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmclient/ndb_mgmclient.h:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/MgmtSrvr.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
  enabled multiple management servrs to fetch data configurations from eachother
ndb/src/mgmsrv/MgmtSrvr.hpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/MgmtSrvrConfig.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/mgmsrv/main.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/src/ndbapi/ndb_cluster_connection.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
ndb/tools/waiter.cpp:
  aligned the parsing of connectstring, retries for connect, allocation of nodeid for all cluster nodes
  removed all dependencies of LocalConfig, except for mgmapi internals
2004-11-18 18:38:38 +00:00
unknown
50ef2cc1a5 ndb: new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
ndb/include/kernel/signaldata/ArbitSignalData.hpp:
  new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
ndb/src/common/debugger/EventLogger.cpp:
  new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  new arbitrator behaviour for >=3-way: < 1/2 nodes can survive
2004-11-18 16:44:50 +01:00
unknown
006448b90d Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/space/pekka/ndb/version/my41


sql/ha_ndbcluster.cc:
  Auto merged
2004-11-18 11:55:53 +01:00
unknown
9615e9becf ndb: charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/common/util/NdbSqlUtil.cpp:
  charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbIndexOperation.cpp:
  charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbOperationSearch.cpp:
  charset fix from Bar (strxfrm_multiply can be 0)
ndb/src/ndbapi/NdbScanOperation.cpp:
  charset fix from Bar (strxfrm_multiply can be 0)
2004-11-18 11:48:21 +01:00
unknown
2267ea3e02 ifdef'd unused table reorg code 2004-11-18 08:42:26 +00:00
unknown
1a9a113201 provided better error printout for mismatch of node types in configuratoin fetch
fixed to that mgmt server actually uses the connectsring


ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  provided better error printout
ndb/src/mgmsrv/main.cpp:
  fixed to that mgmt server actually uses the connectsring
2004-11-16 07:24:11 +00:00
unknown
eb05d78dcb merge
configure.in:
  Auto merged
ndb/src/Makefile.am:
  Auto merged
ndb/src/common/mgmcommon/Makefile.am:
  Auto merged
ndb/src/common/portlib/Makefile.am:
  Auto merged
ndb/src/common/portlib/NdbConfig.c:
  Auto merged
ndb/src/common/transporter/TransporterRegistry.cpp:
  Auto merged
ndb/src/kernel/blocks/backup/Makefile.am:
  Auto merged
ndb/src/mgmapi/Makefile.am:
  Auto merged
ndb/src/mgmclient/Makefile.am:
  Auto merged
ndb/tools/Makefile.am:
  Auto merged
2004-11-16 07:22:30 +01:00
unknown
1f947d4ba8 wl1744 - ndb on windows
ndb/include/ndb_global.h.in:
  remove defines and put them into basestring
ndb/src/common/logger/FileLogHandler.cpp:
  fix
ndb/src/common/logger/Logger.cpp:
  fix
ndb/src/common/portlib/win32/NdbMutex.c:
  fix
ndb/src/common/util/basestring_vsnprintf.c:
  fix
ndb/src/mgmapi/mgmapi.cpp:
  fix
ndb/src/mgmsrv/MgmtSrvr.cpp:
  fix
ndb/src/mgmsrv/Services.cpp:
  fix
ndb/test/ndbapi/Makefile.am:
  fix
ndb/tools/Makefile.am:
  fix
2004-11-16 07:20:30 +01:00
unknown
fe37a1472c always let traffic through to api cluster manager in transporter
print some info event on api connects with wrong versions


BitKeeper/deleted/.del-Makefile.am~91c159ff4011609:
  Delete: ndb/tools/restore/Makefile.am
ndb/src/common/transporter/TransporterRegistry.cpp:
  let traffic through to api cluster manager as well
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
  print some info event on api connects with wrong versions
2004-11-15 12:20:05 +00:00
unknown
8f145e4cbd wl1744 - ndb on windows
ndb/config/win-lib.am:
  removed TLS stuff (which I don't know what it is)
ndb/include/kernel/signaldata/UtilLock.hpp:
  Made stuff public
ndb/include/ndb_global.h.in:
  better defines for strcasecmp
ndb/src/common/transporter/Transporter.cpp:
  Use NDB_INVALID_SOCKET
ndb/src/common/util/SocketClient.cpp:
  Use NDB_INVALID_SOCKET
ndb/src/kernel/vm/Callback.hpp:
  Move callback into SimulatedBlock as it for some mysterious reason
    otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/Configuration.cpp:
  Removed extra (bug) semi-colon
ndb/src/kernel/vm/Mutex.cpp:
  Move callback into SimulatedBlock as it for some mysterious reason
    otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/Mutex.hpp:
  Move callback into SimulatedBlock as it for some mysterious reason
    otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/SectionReader.cpp:
  Use correct struct-type
ndb/src/kernel/vm/SectionReader.hpp:
  Use correct struct-type
ndb/src/kernel/vm/SimulatedBlock.cpp:
  Move callback into SimulatedBlock as it for some mysterious reason
    otherwise got sizeof()=0 on windows
ndb/src/kernel/vm/SimulatedBlock.hpp:
  Move callback into SimulatedBlock as it for some mysterious reason
    otherwise got sizeof()=0 on windows
ndb/src/mgmclient/Makefile.am:
  Add mgm client to windoze
ndb/test/src/Makefile.am:
  Fix lib
2004-11-15 10:43:17 +01:00
unknown
bbe9e857e6 moved ndb_restore together with rest of the ndb tools
kernel includes needed by ndb_restore
    changed link order
    moved LocalConfig to mgmapi
    Moved NdbConfig to Portlib
    mgmapi to use LocalConfig for connectstring parsing instead of it's own
    enable usage of "NULL" connectstring for default
    new ndbmgmclient lib that can be used by e.g. mysqladmin later
    LocalConfig no longer needed here, now in mgmapi
    Send connectstring to mgmapi instead
    added valid connectstring to be with only host without port i.e.
    valid connectstring =host1,host2,host3
    default port will be added


ndb/src/common/portlib/NdbConfig.c:
  Rename: ndb/src/common/mgmcommon/NdbConfig.c -> ndb/src/common/portlib/NdbConfig.c
ndb/include/portlib/NdbConfig.h:
  Rename: ndb/include/mgmcommon/NdbConfig.h -> ndb/include/portlib/NdbConfig.h
ndb/include/mgmapi/LocalConfig.hpp:
  Rename: ndb/include/mgmcommon/LocalConfig.hpp -> ndb/include/mgmapi/LocalConfig.hpp
ndb/tools/restore/Makefile.am:
  Rename: ndb/src/kernel/blocks/backup/restore/Makefile.am -> ndb/tools/restore/Makefile.am
ndb/tools/restore/consumer.cpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer.cpp -> ndb/tools/restore/consumer.cpp
ndb/tools/restore/consumer.hpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer.hpp -> ndb/tools/restore/consumer.hpp
ndb/tools/restore/consumer_printer.hpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.hpp -> ndb/tools/restore/consumer_printer.hpp
ndb/tools/restore/consumer_printer.cpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer_printer.cpp -> ndb/tools/restore/consumer_printer.cpp
ndb/tools/restore/consumer_restore.hpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer_restore.hpp -> ndb/tools/restore/consumer_restore.hpp
ndb/tools/restore/main.cpp:
  Rename: ndb/src/kernel/blocks/backup/restore/main.cpp -> ndb/tools/restore/main.cpp
ndb/tools/restore/consumer_restorem.cpp:
  Rename: ndb/src/kernel/blocks/backup/restore/consumer_restorem.cpp -> ndb/tools/restore/consumer_restorem.cpp
configure.in:
  moved ndb_restore together with rest of the ndb tools
ndb/config/type_ndbapitools.mk.am:
  kernel includes needed by ndb_restore
ndb/src/Makefile.am:
  changed link order
ndb/src/common/mgmcommon/Makefile.am:
  mived LocalConfig to mgmapi
ndb/src/common/portlib/Makefile.am:
  Moved NdbConfig to Portlib
ndb/src/kernel/blocks/backup/Makefile.am:
  moved restore together with rest of ndb tools
ndb/src/mgmapi/LocalConfig.cpp:
  added valid connectstring to be with only host without port i.e.
  valid connectstring =host1,host2,host3
  default port will be added
ndb/src/mgmapi/Makefile.am:
  LocalConfig part of the libmgmapi
ndb/src/mgmapi/mgmapi.cpp:
  mgmapi to use LocalConfig for connectstring parsing instead of it's own
ndb/src/mgmclient/CommandInterpreter.cpp:
  enable usage of "NULL" connectstring for default
ndb/src/mgmclient/Makefile.am:
  new ndbmgmclient lib that can be used by e.g. mysqladmin later
ndb/src/mgmclient/main.cpp:
  LocalConfig no longer needed here, now in mgmapi
  Send connectstring to mgmapi instead
ndb/tools/Makefile.am:
  add ndb_restore to make of tools
ndb/tools/restore/Restore.cpp:
  moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/restore/Restore.hpp:
  moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/restore/consumer_restore.cpp:
  moved include BackupFormat and NdbDictionaryImpl to Restore.hpp
ndb/tools/waiter.cpp:
  LocalConfig moved
2004-11-14 11:02:06 +00:00
unknown
03d6e2453b ndb: minor
ndb/test/ndbapi/testDict.cpp:
  compile fix
2004-11-13 17:49:20 +01:00
unknown
7a7ee30cb5 ndb: fix bug-4644 Err Out of fragment operations
sql/ha_ndbcluster.cc:
  compile fix in DBUG code
ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp:
  fix count of metadata pages
ndb/include/kernel/signaldata/TupFrag.hpp:
  bug-4644 fix
ndb/src/kernel/blocks/ERROR_codes.txt:
  bug-4644 fix
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
  bug-4644 fix
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  bug-4644 fix
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
  bug-4644 fix
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
  bug-4644 fix
ndb/src/kernel/blocks/dbtux/Dbtux.hpp:
  bug-4644 fix
ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp:
  bug-4644 fix
ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp:
  bug-4644 fix
ndb/test/ndbapi/testDict.cpp:
  bug-4644 fix
2004-11-13 17:34:34 +01:00
unknown
c63ae27eb8 wl1744 - recommit stuff lost in corrupt clone
ndb/config/win-libraries:
  recommit stuff lost in corrupt clone
ndb/config/win-sources:
  recommit stuff lost in corrupt clone
2004-11-12 10:59:00 +01:00
unknown
48b47b41c5 wl1744 - more script fixes
ndb/Makefile.am:
  remove SCCS-files
2004-11-12 09:18:26 +01:00
unknown
4d51f987bd wl1744 - ndb on windoze
ndb/test/src/getarg.c:
  fix
2004-11-12 08:48:31 +01:00
unknown
c87d525f6a wl1744 - ndb win port
improve ndb_global.h


configure.in:
  check for some more includes
ndb/include/ndb_global.h.in:
  better ndb_global.h.in
2004-11-11 22:39:24 +01:00
unknown
26c5503415 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744


ndb/src/ndbapi/ndberror.c:
  Auto merged
2004-11-11 22:02:17 +01:00
unknown
f2cbfb80a7 wl1744 - ndb win-port
ndb/include/ndbapi/NdbDictionary.hpp:
  win-port
ndb/include/ndbapi/ndb_cluster_connection.hpp:
  win-port
ndb/include/util/SocketServer.hpp:
  win-port
ndb/src/common/portlib/win32/NdbCondition.c:
  win-port
ndb/src/common/portlib/win32/NdbEnv.c:
  win-port
ndb/src/common/portlib/win32/NdbHost.c:
  win-port
ndb/src/common/portlib/win32/NdbMem.c:
  win-port
ndb/src/common/portlib/win32/NdbMutex.c:
  win-port
ndb/src/common/portlib/win32/NdbSleep.c:
  win-port
ndb/src/common/portlib/win32/NdbTCP.c:
  win-port
ndb/src/common/portlib/win32/NdbThread.c:
  win-port
ndb/src/common/portlib/win32/NdbTick.c:
  win-port
ndb/src/common/util/File.cpp:
  win-port
ndb/src/mgmsrv/ConfigInfo.cpp:
  win-port
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  win-port
ndb/src/mgmsrv/MgmtSrvr.cpp:
  win-port
ndb/src/mgmsrv/MgmtSrvr.hpp:
  win-port
ndb/src/mgmsrv/Services.cpp:
  win-port
ndb/src/mgmsrv/Services.hpp:
  win-port
ndb/src/mgmsrv/SignalQueue.hpp:
  win-port
ndb/src/ndbapi/NdbDictionaryImpl.hpp:
  win-port
ndb/test/src/NdbRestarts.cpp:
  win-port
2004-11-11 21:38:42 +01:00
unknown
44af4e4a99 wl1744 - ndb on windoze
ndb/Makefile.am:
  ndb-windows
ndb/src/Makefile.am:
  ndb-windows
ndb/src/common/debugger/Makefile.am:
  ndb-windows
ndb/src/common/debugger/signaldata/Makefile.am:
  ndb-windows
ndb/src/common/logger/Makefile.am:
  ndb-windows
ndb/src/common/mgmcommon/Makefile.am:
  ndb-windows
ndb/src/common/portlib/Makefile.am:
  ndb-windows
ndb/src/common/transporter/Makefile.am:
  ndb-windows
ndb/src/common/util/File.cpp:
  ndb-windows
ndb/src/common/util/Makefile.am:
  ndb-windows
ndb/src/cw/cpcd/Makefile.am:
  ndb-windows
ndb/src/kernel/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/backup/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/backup/restore/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/cmvmi/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/dbacc/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/dbdict/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/dbdih/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/dblqh/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/dbtc/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/dbtup/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/dbtux/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/dbutil/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/grep/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/ndbcntr/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/ndbfs/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/qmgr/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/suma/Makefile.am:
  ndb-windows
ndb/src/kernel/blocks/trix/Makefile.am:
  ndb-windows
ndb/src/kernel/error/Makefile.am:
  ndb-windows
ndb/src/kernel/vm/Makefile.am:
  ndb-windows
ndb/src/mgmapi/Makefile.am:
  ndb-windows
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  ndb-windows
ndb/src/mgmsrv/Makefile.am:
  ndb-windows
ndb/src/mgmsrv/MgmtSrvr.cpp:
  ndb-windows
ndb/src/ndbapi/Makefile.am:
  ndb-windows
ndb/src/ndbapi/ndberror.c:
  ndb-windows
ndb/test/include/NdbSchemaOp.hpp:
  ndb-windows
ndb/test/run-test/Makefile.am:
  ndb-windows
ndb/test/src/CpcClient.cpp:
  ndb-windows
ndb/test/src/Makefile.am:
  ndb-windows
ndb/test/src/NdbRestarter.cpp:
  ndb-windows
ndb/test/src/getarg.c:
  ndb-windows
2004-11-11 21:25:55 +01:00
unknown
df6f098813 ndb_test_platform.cpp:
better printouts in ndb_test_platform


ndb/tools/ndb_test_platform.cpp:
  better printouts in ndb_test_platform
2004-11-11 16:51:38 +00:00
unknown
0fa48ea490 waiter.cpp:
fixed so that connectring option works


ndb/tools/waiter.cpp:
  fixed so that connectring option works
2004-11-11 16:38:15 +00:00
unknown
9fe89939d0 basestring_vsnprintf fix for size==0 2004-11-11 15:53:33 +00:00
unknown
3048dc0fa2 forgot a return 0
removed some errorcodes not used


ndb/src/mgmclient/CommandInterpreter.cpp:
  forgot a return 0
ndb/src/ndbapi/ndberror.c:
  removed some errorcodes not used
2004-11-11 13:22:33 +00:00
unknown
8d072e64d2 added ndb error codes and better explanations 2004-11-11 10:05:28 +00:00
unknown
d55be176d7 wl1744- ndb windows
move ports into ndb_global


BitKeeper/deleted/.del-ndb_version.h~c759dd144f698ea:
  Delete: ndb/include/ndb_version.h
BitKeeper/deleted/.del-ndb_global.h~c4762a8c8f5136c6:
  Delete: ndb/include/ndb_global.h
configure.in:
  also generate ndb_global
ndb/include/ndb_types.h:
  fix
ndb/src/common/mgmcommon/Makefile.am:
  put port into ndb_global
ndb/src/mgmsrv/ConfigInfo.cpp:
  win
ndb/src/mgmsrv/Makefile.am:
  moved ports into ndb_global
ndb/src/ndbapi/ndberror.c:
  use my_snprintf
2004-11-11 08:15:52 +01:00
unknown
f000604a11 Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/wl1744


configure.in:
  Auto merged
ndb/include/mgmapi/mgmapi.h:
  Auto merged
ndb/src/common/mgmcommon/Makefile.am:
  Auto merged
ndb/src/common/mgmcommon/NdbConfig.c:
  Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
  Auto merged
ndb/src/mgmsrv/Makefile.am:
  Auto merged
ndb/src/mgmsrv/main.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
2004-11-10 21:53:21 +01:00
unknown
b7a44f59ad Merge mysql.com:/home/jonas/src/wl1744
into mysql.com:/home/jonas/src/fix
2004-11-10 21:51:10 +01:00
unknown
78f9a1fc1c wl1744 - ndb windows port
move versing handling into ndb_version.h.in (from config.h)


configure.in:
  generate ndb/include/ndb_version.h during configure
ndb/Makefile.am:
  extra target for just creating dsp files
2004-11-10 21:43:12 +01:00
unknown
fe2a47b240 wl1744 - ndb windoze port
ndb/include/ndb_types.h:
  ndb windoze
ndb/src/common/util/version.c:
  ndb windoze
ndb/src/mgmsrv/ConfigInfo.cpp:
  ndb windoze
ndb/src/ndbapi/ndberror.c:
  ndb windoze
2004-11-10 21:31:41 +01:00
unknown
b6ed85ba5a added configure switch for ndb port number
added new variable for ndb port 1186
    changed meaning of ndb_port_base to be default tcp port setting
    changed to use split between port and port_base for ndbcluster
    so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
    added larger space to pid print
    moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
    added c-api to Ndb_mgmclient
    pass also ndb_port to make


acinclude.m4:
  added configure switch for ndb port number
configure.in:
  added new variable for ndb port 1186
  changed meaning of ndb_port_base to be default tcp port setting
mysql-test/mysql-test-run.sh:
  changed to use split between port and port_base for ndbcluster
mysql-test/ndb/Makefile.am:
  so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
mysql-test/ndb/ndbcluster.sh:
  so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
ndb/src/common/mgmcommon/LocalConfig.cpp:
  so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
ndb/src/common/mgmcommon/Makefile.am:
  so that ndb_port and ndb_port_base are propagated to startscript for ndbcluster
ndb/src/common/mgmcommon/NdbConfig.c:
  added larger space to pid print
ndb/src/mgmclient/CommandInterpreter.cpp:
  moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
  added c-api to Ndb_mgmclient
ndb/src/mgmclient/main.cpp:
  moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
ndb/src/mgmclient/ndb_mgmclient.hpp:
  moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
ndb/src/mgmsrv/ConfigInfo.cpp:
  moved readAndExecute out of CommandInterpreter to avoid linking lib with readline
ndb/src/mgmsrv/Makefile.am:
  pass also ndb_port to make
2004-11-10 16:05:28 +00:00
unknown
63b4095284 wl1744 - nbd windoze port
ndb/include/logger/SysLogHandler.hpp:
  win-port
ndb/include/ndb_global.h:
  win-port
ndb/include/portlib/PortDefs.h:
  win-port
ndb/src/common/mgmcommon/NdbConfig.c:
  win-port
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
  win-port
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  win-port
ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp:
  win-port
ndb/src/kernel/main.cpp:
  win-port
ndb/src/kernel/vm/Configuration.cpp:
  win-port
ndb/src/kernel/vm/Emulator.cpp:
  win-port
ndb/src/mgmsrv/CommandInterpreter.cpp:
  win-port
ndb/src/mgmsrv/main.cpp:
  win-port
scripts/make_win_src_distribution.sh:
  win-port
2004-11-10 14:18:49 +01:00
unknown
a12d6fd6a7 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-10 07:45:28 +00:00
unknown
6049821cd0 wl1744 - win compile fixes
ndb/include/kernel/signaldata/RepImpl.hpp:
  more win-compile-fixes
ndb/include/mgmapi/mgmapi.h:
  more win-compile-fixes
ndb/include/ndbapi/NdbConnection.hpp:
  more win-compile-fixes
ndb/src/common/util/Properties.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
  more win-compile-fixes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
  more win-compile-fixes
ndb/src/kernel/blocks/grep/Grep.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/Config.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/ConfigInfo.cpp:
  more win-compile-fixes
ndb/src/mgmsrv/InitConfigFileParser.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbBlob.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbConnection.cpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbImpl.hpp:
  more win-compile-fixes
ndb/src/ndbapi/NdbOperationExec.cpp:
  more win-compile-fixes
ndb/test/ndbapi/testOperations.cpp:
  more win-compile-fixes
sql/ha_ndbcluster.cc:
  more win-compile-fixes
2004-11-10 00:39:12 +01:00
unknown
59ee75bd57 wl1744 - fix compiler problems
ndb/include/debugger/GrepError.hpp:
  prexif
ndb/include/kernel/LogLevel.hpp:
  fix correct type prototype
ndb/include/kernel/signaldata/FsCloseReq.hpp:
  remove usage of true
ndb/include/mgmapi/mgmapi.h:
  use Uint64 instead of long long
ndb/include/mgmcommon/IPCConfig.hpp:
  correct type
ndb/include/portlib/NdbTCP.h:
  fix #elif
ndb/include/transporter/TransporterRegistry.hpp:
  correct type
ndb/include/util/Parser.hpp:
  correct type
  made stuff public as vc++ couldn't handle template friends
ndb/include/util/SimpleProperties.hpp:
  correct type
ndb/src/common/debugger/EventLogger.cpp:
  Prefix GrepError::Code as GrepError::GE_Code
ndb/src/common/debugger/GrepError.cpp:
  Prefix GrepError::Code as GrepError::GE_Code
ndb/src/common/debugger/signaldata/FsCloseReq.cpp:
  removed usage of true
ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp:
  removed usage of true
ndb/src/common/logger/LogHandlerList.hpp:
  use ndb_global
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
  removed ConfigRetriever::get_config(file) from windows
ndb/src/common/transporter/TransporterRegistry.cpp:
  interface is a reserved word in vc++
ndb/src/kernel/blocks/grep/Grep.hpp:
  Prefix GrepError::Code as GrepError::GE_Code
ndb/src/kernel/vm/Configuration.cpp:
  Use BaseString::snprintf
ndb/src/kernel/vm/Configuration.hpp:
  correct type
ndb/src/kernel/vm/SimplePropertiesSection.cpp:
  correct type
ndb/src/mgmapi/mgmapi_configuration.cpp:
  use Uin6t4
ndb/src/mgmapi/mgmapi_configuration.hpp:
  use Uin6t4
ndb/src/mgmsrv/ConfigInfo.cpp:
  Prefix
ndb/src/mgmsrv/ConfigInfo.hpp:
  prefix
ndb/src/ndbapi/Ndb.cpp:
  removed usued include
ndb/src/ndbapi/NdbImpl.hpp:
  prefix
ndb/src/ndbapi/ObjectMap.hpp:
  Better typecast
2004-11-10 00:13:26 +01:00
unknown
f0614a9fec wl1744 - ndb on windows
Add rules for creating dsp-files
2004-11-10 00:03:01 +01:00
unknown
4c26186b47 added management function to purge stale sessions in the management server
ndb/include/util/Bitmask.hpp:
  added bitXORC
ndb/include/util/SocketServer.hpp:
  added method to apply function on each session
ndb/src/common/util/SocketServer.cpp:
  added method to apply function on each session
2004-11-09 19:39:29 +00:00
unknown
daa71e1996 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-09 12:00:50 +01:00
unknown
be0933aa7d ndb: compile fix for hpita2-64 bit - remove a bunch of includes 2004-11-09 11:59:28 +01:00
unknown
415221f3f1 Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
2004-11-08 14:07:37 +00:00
unknown
a3503c7505 added ndb test platform test 2004-11-08 13:33:10 +00:00
unknown
2f182b3eb0 compile fix for ndbapi test program on irix (variable scope)
ndb/test/include/NDBT_Test.hpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/ScanFunctions.hpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testDataBuffers.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testDeadlock.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testDict.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testIndex.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testLcp.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testNdbApi.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testOIBasic.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testReadPerf.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testRestartGci.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testScanPerf.cpp:
  compile fix for ndbapi test program on irix
ndb/test/ndbapi/testSystemRestart.cpp:
  compile fix for ndbapi test program on irix
2004-11-08 13:59:04 +01:00
unknown
70663052d8 Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-08 12:45:31 +01:00
unknown
369845a46c Makefile.am:
fix to make make -jN work


ndb/src/mgmclient/Makefile.am:
  fix to make make -jN work
2004-11-08 11:28:57 +00:00
unknown
1490901ecc Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/jonas/src/mysql-4.1
2004-11-08 11:53:50 +01:00
unknown
d03f2330aa Makefile.am:
changed make order
.del-Makefile_old~dde91b00b37d2a06:
  Delete: ndb/tools/Makefile_old
.del-Makefile_old~70d769657921a760:
  Delete: ndb/test/tools/Makefile_old
.del-Makefile_old~58f0559822147dd9:
  Delete: ndb/test/tools/old_dirs/waiter/Makefile_old
.del-Makefile_old~4fdb3c92ebd2eb29:
  Delete: ndb/test/run-test/Makefile_old
.del-Makefile_old~1497f81a0c2125e:
  Delete: ndb/test/src/Makefile_old
.del-Makefile_old~fbd3934fabdfe550:
  Delete: ndb/test/ndbapi/Makefile_old
.del-Makefile_old~ec8e48326d4aa09:
  Delete: ndb/test/ndbapi/old_dirs/flexBench/Makefile_old
.del-Makefile_old~1046c9ce93ef1fb8:
  Delete: ndb/test/ndbapi/bank/Makefile_old
.del-Makefile_old~7c98d8f1d275983f:
  Delete: ndb/src/ndbapi/Makefile_old
.del-Makefile_old~4463cf06fc2fceb9:
  Delete: ndb/src/mgmapi/Makefile_old
.del-Makefile_old~274925c960801993:
  Delete: ndb/src/mgmsrv/Makefile_old
.del-Makefile_old~b3d33fdde8bc12c0:
  Delete: ndb/src/kernel/Makefile_old
.del-Makefile_old~6dbe2defc7237d4d:
  Delete: ndb/src/kernel/vm/Makefile_old
.del-Makefile_old~cf05571c99011360:
  Delete: ndb/src/kernel/error/Makefile_old
.del-Makefile_old~29a955a7e17d650e:
  Delete: ndb/src/kernel/blocks/Makefile_old
.del-Makefile_old~f8b2a47eb434d43:
  Delete: ndb/src/kernel/blocks/suma/Makefile_old
.del-Makefile_old~f0c05bb23d5c23ca:
  Delete: ndb/src/kernel/blocks/grep/Makefile_old
.del-Makefile_old~a6fd2e579249f6e0:
  Delete: ndb/src/kernel/blocks/ndbcntr/Makefile_old
.del-Makefile_old~7e8d8b4e2b1fa8f7:
  Delete: ndb/src/kernel/blocks/ndbfs/Makefile_old
.del-Makefile_old~73c174fc712803c5:
  Delete: ndb/src/kernel/blocks/qmgr/Makefile_old
.del-Makefile_old~16de31311951fc04:
  Delete: ndb/src/kernel/blocks/trix/Makefile_old
.del-Makefile_old~788c80e5e758ac7:
  Delete: ndb/src/kernel/blocks/dbutil/Makefile_old
.del-Makefile_old~5ebf2b4f85ab09cf:
  Delete: ndb/src/kernel/blocks/dbtux/Makefile_old
.del-Makefile_old~530f9e0bc038a62:
  Delete: ndb/src/kernel/blocks/dbtup/Makefile_old
.del-Makefile_old~315b927180484020:
  Delete: ndb/src/kernel/blocks/dbtc/Makefile_old
.del-Makefile_old~d013a228cad86ba0:
  Delete: ndb/src/kernel/blocks/dbacc/Makefile_old
.del-Makefile_old~c2e33f043b8aa45e:
  Delete: ndb/src/kernel/blocks/cmvmi/Makefile_old
.del-Makefile_old~bdf406f5fb4696cb:
  Delete: ndb/src/kernel/blocks/dblqh/Makefile_old
.del-Makefile_old~38a24016d2ad8aa7:
  Delete: ndb/src/kernel/blocks/dbdict/Makefile_old
.del-Makefile_old~2804044250a6fd91:
  Delete: ndb/src/kernel/blocks/dbdih/Makefile_old
.del-Makefile_old~e58eec87cd8dc79e:
  Delete: ndb/src/cw/Makefile_old
.del-Makefile_old~b50c85b8eb69aacb:
  Delete: ndb/src/kernel/blocks/backup/Makefile_old
.del-Makefile_old~16e186623106985e:
  Delete: ndb/src/cw/cpcd/Makefile_old
.del-Makefile_old~f03f74238d640d5:
  Delete: ndb/src/common/mgmcommon/Makefile_old
.del-Makefile_old~a8e9765b520b7c68:
  Delete: ndb/src/common/util/Makefile_old
.del-Makefile_old~9f275aed83c8652b:
  Delete: ndb/src/common/transporter/Makefile_old
.del-Makefile_old~8d901a664eca1ec:
  Delete: ndb/src/common/portlib/Makefile_old
.del-Makefile_old~19643559613c75c7:
  Delete: ndb/src/common/portlib/old_dirs/unix/Makefile_old
.del-Makefile_old~a3f6fc0e1411bb28:
  Delete: ndb/src/common/logger/Makefile_old
.del-Makefile_old~754f27fab7d4da3b:
  Delete: ndb/src/common/debugger/signaldata/Makefile_old
.del-Makefile_old~54ca8df95719e59f:
  Delete: ndb/src/common/debugger/Makefile_old


BitKeeper/deleted/.del-Makefile_old~54ca8df95719e59f:
  Delete: ndb/src/common/debugger/Makefile_old
BitKeeper/deleted/.del-Makefile_old~754f27fab7d4da3b:
  Delete: ndb/src/common/debugger/signaldata/Makefile_old
BitKeeper/deleted/.del-Makefile_old~a3f6fc0e1411bb28:
  Delete: ndb/src/common/logger/Makefile_old
BitKeeper/deleted/.del-Makefile_old~19643559613c75c7:
  Delete: ndb/src/common/portlib/old_dirs/unix/Makefile_old
BitKeeper/deleted/.del-Makefile_old~8d901a664eca1ec:
  Delete: ndb/src/common/portlib/Makefile_old
BitKeeper/deleted/.del-Makefile_old~9f275aed83c8652b:
  Delete: ndb/src/common/transporter/Makefile_old
BitKeeper/deleted/.del-Makefile_old~a8e9765b520b7c68:
  Delete: ndb/src/common/util/Makefile_old
BitKeeper/deleted/.del-Makefile_old~f03f74238d640d5:
  Delete: ndb/src/common/mgmcommon/Makefile_old
BitKeeper/deleted/.del-Makefile_old~16e186623106985e:
  Delete: ndb/src/cw/cpcd/Makefile_old
BitKeeper/deleted/.del-Makefile_old~b50c85b8eb69aacb:
  Delete: ndb/src/kernel/blocks/backup/Makefile_old
BitKeeper/deleted/.del-Makefile_old~e58eec87cd8dc79e:
  Delete: ndb/src/cw/Makefile_old
BitKeeper/deleted/.del-Makefile_old~2804044250a6fd91:
  Delete: ndb/src/kernel/blocks/dbdih/Makefile_old
BitKeeper/deleted/.del-Makefile_old~38a24016d2ad8aa7:
  Delete: ndb/src/kernel/blocks/dbdict/Makefile_old
BitKeeper/deleted/.del-Makefile_old~bdf406f5fb4696cb:
  Delete: ndb/src/kernel/blocks/dblqh/Makefile_old
BitKeeper/deleted/.del-Makefile_old~c2e33f043b8aa45e:
  Delete: ndb/src/kernel/blocks/cmvmi/Makefile_old
BitKeeper/deleted/.del-Makefile_old~d013a228cad86ba0:
  Delete: ndb/src/kernel/blocks/dbacc/Makefile_old
BitKeeper/deleted/.del-Makefile_old~315b927180484020:
  Delete: ndb/src/kernel/blocks/dbtc/Makefile_old
BitKeeper/deleted/.del-Makefile_old~530f9e0bc038a62:
  Delete: ndb/src/kernel/blocks/dbtup/Makefile_old
BitKeeper/deleted/.del-Makefile_old~5ebf2b4f85ab09cf:
  Delete: ndb/src/kernel/blocks/dbtux/Makefile_old
BitKeeper/deleted/.del-Makefile_old~788c80e5e758ac7:
  Delete: ndb/src/kernel/blocks/dbutil/Makefile_old
BitKeeper/deleted/.del-Makefile_old~16de31311951fc04:
  Delete: ndb/src/kernel/blocks/trix/Makefile_old
BitKeeper/deleted/.del-Makefile_old~73c174fc712803c5:
  Delete: ndb/src/kernel/blocks/qmgr/Makefile_old
BitKeeper/deleted/.del-Makefile_old~7e8d8b4e2b1fa8f7:
  Delete: ndb/src/kernel/blocks/ndbfs/Makefile_old
BitKeeper/deleted/.del-Makefile_old~a6fd2e579249f6e0:
  Delete: ndb/src/kernel/blocks/ndbcntr/Makefile_old
BitKeeper/deleted/.del-Makefile_old~f0c05bb23d5c23ca:
  Delete: ndb/src/kernel/blocks/grep/Makefile_old
BitKeeper/deleted/.del-Makefile_old~f8b2a47eb434d43:
  Delete: ndb/src/kernel/blocks/suma/Makefile_old
BitKeeper/deleted/.del-Makefile_old~29a955a7e17d650e:
  Delete: ndb/src/kernel/blocks/Makefile_old
BitKeeper/deleted/.del-Makefile_old~cf05571c99011360:
  Delete: ndb/src/kernel/error/Makefile_old
BitKeeper/deleted/.del-Makefile_old~6dbe2defc7237d4d:
  Delete: ndb/src/kernel/vm/Makefile_old
BitKeeper/deleted/.del-Makefile_old~b3d33fdde8bc12c0:
  Delete: ndb/src/kernel/Makefile_old
BitKeeper/deleted/.del-Makefile_old~274925c960801993:
  Delete: ndb/src/mgmsrv/Makefile_old
BitKeeper/deleted/.del-Makefile_old~4463cf06fc2fceb9:
  Delete: ndb/src/mgmapi/Makefile_old
BitKeeper/deleted/.del-Makefile_old~7c98d8f1d275983f:
  Delete: ndb/src/ndbapi/Makefile_old
BitKeeper/deleted/.del-Makefile_old~1046c9ce93ef1fb8:
  Delete: ndb/test/ndbapi/bank/Makefile_old
BitKeeper/deleted/.del-Makefile_old~ec8e48326d4aa09:
  Delete: ndb/test/ndbapi/old_dirs/flexBench/Makefile_old
BitKeeper/deleted/.del-Makefile_old~fbd3934fabdfe550:
  Delete: ndb/test/ndbapi/Makefile_old
BitKeeper/deleted/.del-Makefile_old~1497f81a0c2125e:
  Delete: ndb/test/src/Makefile_old
BitKeeper/deleted/.del-Makefile_old~4fdb3c92ebd2eb29:
  Delete: ndb/test/run-test/Makefile_old
BitKeeper/deleted/.del-Makefile_old~58f0559822147dd9:
  Delete: ndb/test/tools/old_dirs/waiter/Makefile_old
BitKeeper/deleted/.del-Makefile_old~70d769657921a760:
  Delete: ndb/test/tools/Makefile_old
BitKeeper/deleted/.del-Makefile_old~dde91b00b37d2a06:
  Delete: ndb/tools/Makefile_old
ndb/src/mgmclient/Makefile.am:
  changed make order
2004-11-08 10:35:23 +00:00