ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
sql/ha_ndbcluster.h:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.cc:
Auto merged
acinclude.m4:
Auto merged
ndb/include/mgmapi/mgmapi_config_parameters.h:
Auto merged
ndb/src/common/mgmcommon/IPCConfig.cpp:
Auto merged
ndb/src/mgmsrv/ConfigInfo.cpp:
Auto merged
They are separated from the other WL#1856 stuff, because they improve the behaviour of the current tests.
Make the result sets (order of rows) more predictable by using ORDER BY.
mysql-test/include/ps_modify.inc:
Make the result sets more predictable by using ORDER BY
mysql-test/include/ps_modify1.inc:
Make the result sets more predictable by using ORDER BY
mysql-test/r/ps_2myisam.result:
updated results
mysql-test/r/ps_3innodb.result:
updated results
mysql-test/r/ps_4heap.result:
updated results
mysql-test/r/ps_5merge.result:
updated results
mysql-test/r/ps_6bdb.result:
updated results
BitKeeper/etc/logging_ok:
Logging to logging@openlogging.org accepted
Improved Default SCI config params
Added missing SCI libraries in ndb_mgm and atrt
Added max of 1024 signals per receive on transporter (to improve
real-time bahaviour and to ensure no job buffer explosion, still
some more work left on avoiding job buffer explosion in the general
case)
ndb/src/common/transporter/Packer.cpp:
Fix for job buffer explosion and real-time behaviour also in
high load scenarios.
ndb/src/common/transporter/SCI_Transporter.cpp:
Restored old Shared memory buffer implementation.
Changed condition slightly on when to send SCI buffer.
ndb/src/common/transporter/SCI_Transporter.hpp:
Changed back to old shared memory implementation
ndb/src/common/transporter/SHM_Buffer.hpp:
Changed back to old shared memory implementation
ndb/src/common/transporter/SHM_Transporter.cpp:
Changed back to old shared memory implementation
ndb/src/common/transporter/SHM_Transporter.hpp:
Changed back to old shared memory implementation
ndb/src/common/transporter/TransporterRegistry.cpp:
Changed back to old shared memory implementation
ndb/src/kernel/vm/FastScheduler.hpp:
Spelling error
ndb/src/mgmclient/Makefile.am:
Missing SCI library
ndb/src/mgmsrv/ConfigInfo.cpp:
Changed to more proper config parameters
ndb/test/run-test/Makefile.am:
Added missing SCI library
Use ndb_mgm_listen_event to wait for backup messages
ndb/src/mgmclient/CommandInterpreter.cpp:
Listen to backup event
start backup
wait until event related to backup arrives
ndb/src/mgmsrv/Services.cpp:
Fix newline at end of reply
key Column Fails".
mysql-test/r/ps.result:
Test results updated: a test case for Bug#5510 "inserting Null in
AutoIncrement primary key Column Fails".
mysql-test/r/ps_2myisam.result:
Bug#5510: a different warning in case of NULL->default truncation.This is
OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_3innodb.result:
Bug#5510: a different warning in case of NULL->default truncation.This is
OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_4heap.result:
Bug#5510: a different warning in case of NULL->default truncation.This is
OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_5merge.result:
Bug#5510: a different warning in case of NULL->default truncation.This is
OK, the new warning is the same as produced by conventional execution.
mysql-test/r/ps_6bdb.result:
Bug#5510: a different warning in case of NULL->default truncation.This is
OK, the new warning is the same as produced by conventional execution.
mysql-test/t/ps.test:
A test case for Bug#5510 "inserting Null in AutoIncrement primary key Column
Fails".
sql/item.cc:
A fix for bug#5510 "inserting Null in AutoIncrement primary key Column
Fails": use proper Field API function for NULL placholeders.
removed some #id 0 code
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
replaced some "localhost" checks with try bind
ndb/src/mgmsrv/MgmtSrvr.cpp:
removed some #id 0 code
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
oops
ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
jamEntry
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
jamEntry
mysql-test/r/ndb_index.result:
ndb charsets: minimal fix to make test pass
mysql-test/t/ndb_index.test:
ndb charsets: minimal fix to make test pass
using tryBind instead to determine if we're "config host" is "local"
ndb/include/util/SocketServer.hpp:
made tryBind static
ndb/src/common/util/SocketServer.cpp:
made tryBind static
ndb/src/mgmsrv/MgmtSrvr.cpp:
using tryBind instead to determine if we're "config host" is "local"
Removed grep introduced bogus mgm call
BitKeeper/deleted/.del-LogLevel.cpp~314a6bada2df40a8:
Delete: ndb/src/common/debugger/LogLevel.cpp
ndb/include/debugger/EventLogger.hpp:
Removed match functionality and put into mgmapi
ndb/include/kernel/LogLevel.hpp:
Update LogLevel
ndb/include/mgmapi/mgmapi_config_parameters.h:
fix parameter
ndb/src/common/debugger/EventLogger.cpp:
Removed match functionality and put into mgmapi
ndb/src/common/debugger/Makefile.am:
removed LogLevel.cpp
ndb/src/cw/cpcd/APIService.cpp:
compiler warning
ndb/src/cw/cpcd/CPCD.cpp:
compiler warning
ndb/src/cw/cpcd/CPCD.hpp:
compiler warning
ndb/src/cw/cpcd/main.cpp:
compiler warning
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Changed name of config parameter
ndb/src/kernel/vm/Configuration.cpp:
Changed name of config parameter
into poseidon.(none):/home/tomas/mysql-4.1-ndb-merge
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmsrv/main.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionary.cpp:
Auto merged
ndb/src/ndbapi/NdbDictionaryImpl.cpp:
Auto merged
ndb/src/ndbapi/Ndbinit.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
added support for setting up multiple interfaces
correct connect address for mgmt server
bug, -l flag would be interpreted as connectstring
added flag to remove all node id checks
changed automatic allocation of ports somewhat
ndb/include/mgmapi/mgmapi_config_parameters.h:
removed different CFG_ defined for connection host names
ndb/include/transporter/TransporterRegistry.hpp:
added support for setting up multiple interfaces
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
removed different CFG_ defined for connection host names
ndb/src/common/mgmcommon/IPCConfig.cpp:
added support for setting up multiple interfaces
ndb/src/common/portlib/NdbTCP.cpp:
added debug printouts
ndb/src/common/transporter/TransporterRegistry.cpp:
added support for setting up multiple interfaces
ndb/src/common/util/SocketServer.cpp:
added my_thread init to enable debug printouts
ndb/src/mgmclient/CommandInterpreter.cpp:
shortened lines
ndb/src/mgmsrv/ConfigInfo.cpp:
removed different CFG_ defined for connection host names
changed automatic allocation of ports somewhat
ndb/src/mgmsrv/MgmtSrvr.cpp:
correct connect address for mgmt server
ndb/src/mgmsrv/Services.cpp:
shoretened lines
ndb/src/mgmsrv/main.cpp:
bug, -l flag would be interpreted as connectstring
added flag to remove all node id checks
with a fixed constant to pass on QNX:
max_data_file_length is calculated depending on max possible value of
record pointer. It's different on QNX, so the difference in results is OK.
mysql-test/t/ps.test:
A quick fix for bug#5556: replace a column of SHOW TABLE STATUS result
with a fixed constant to pass on QNX:
max_data_file_length is calculated depending on max value of record
pointer. It's different on QNX, so the result difference is intentional.
Add support for getting events via mgmapi
removed all traces of stat port
BitKeeper/deleted/.del-NodeLogLevel.cpp~324045b93af7123b:
Delete: ndb/src/mgmsrv/NodeLogLevel.cpp
BitKeeper/deleted/.del-NodeLogLevel.hpp~4f4ab0fe52fb497c:
Delete: ndb/src/mgmsrv/NodeLogLevel.hpp
BitKeeper/deleted/.del-NodeLogLevelList.cpp~97dc9c909e3e92bf:
Delete: ndb/src/mgmsrv/NodeLogLevelList.cpp
BitKeeper/deleted/.del-NodeLogLevelList.hpp~ef567dd850abddc7:
Delete: ndb/src/mgmsrv/NodeLogLevelList.hpp
ndb/include/debugger/EventLogger.hpp:
Split EventLogger into two classes
ndb/include/kernel/LogLevel.hpp:
Add some nice to have methods + use uint8 for storage
ndb/include/kernel/signaldata/EventSubscribeReq.hpp:
operator=
ndb/include/kernel/signaldata/SetLogLevelOrd.hpp:
operator=
ndb/include/mgmapi/mgmapi.h:
remove deprecated vars
ndb/src/common/debugger/EventLogger.cpp:
Split into 2
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Remove hardcoded mgm stuff
ndb/src/mgmsrv/CommandInterpreter.cpp:
#if 0
some deprecated code
ndb/src/mgmsrv/Makefile.am:
remove NodeLogLevel*
ndb/src/mgmsrv/MgmtSrvr.cpp:
Remove dead code
Handle multiple event listeners in mgmapi
ndb/src/mgmsrv/MgmtSrvr.hpp:
Remove dead code
Handle multiple event listeners in mgmapi
ndb/src/mgmsrv/Services.cpp:
listen event method in mgmapi
ndb/src/mgmsrv/Services.hpp:
listen event method in mgmapi
ndb/src/mgmsrv/main.cpp:
remove stat port
acinclude.m4:
Uncommented zlib library message checking for Netware.
netware/init_db.sql:
Applied a patch for Netware.
netware/test_db.sql:
Applied a patch for Netware.
