into mysql.com:/space/pekka/ndb/version/my50
mysql-test/r/ndb_blob.result:
Auto merged
mysql-test/t/ndb_blob.test:
Auto merged
ndb/include/kernel/signaldata/TcKeyReq.hpp:
Auto merged
ndb/include/ndbapi/NdbBlob.hpp:
Auto merged
ndb/src/ndbapi/NdbBlob.cpp:
Auto merged
ndb/test/ndbapi/testBlobs.cpp:
Auto merged
sql/sql_table.cc:
Auto merged
ndb/tools/delete_all.cpp:
nuts
- addded more retries to wait for nodefailure to complete
Bug #19039 multi node failure causes node failure handling not to complete
- patch to avoid this scenario when the management server is used to perform the stop
- wait for NF_COMPLETE_REP in management server before returning
ndb: allocate nodeid
- only retry on retryable error
add two new start options that will decrease likelyhood of bug#18612
push cntr-sp2 logic down into qmgr-sp1 to decrease likelyhood of bug#18612
ndb/include/kernel/signaldata/CmRegSignalData.hpp:
Expand CmRegReq with lots of stuff
ndb/include/mgmapi/ndb_logevent.h:
Add Start report during sp1
ndb/src/common/debugger/EventLogger.cpp:
Add Start report during sp1
ndb/src/kernel/blocks/dbdih/DbdihInit.cpp:
Init cntrref
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fix small bugs related to partial initial start
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Remove timeouts as they are handled in QMGR nowadays
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
that will lead to start problems (crashes...)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
that will lead to start problems (crashes...)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Push cntr sp2 logic down to QMGR to prevent the forming of multiple QMGR cluster
that will lead to start problems (crashes...)
ndb/src/kernel/vm/Configuration.cpp:
Add new flags
--initial-start
--nowait-nodes
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/test/src/NdbRestarts.cpp:
Auto merged
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
merge
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
merge
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
merge
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
merge
post weeked fixes :-)
change impl. to use READ_NODESREQ to query state of other qmgr(partition)
this as it has no (current) side effects, so that it's possible only to kill
starting cluster (if one started and one starting)
ndb/include/kernel/signaldata/FailRep.hpp:
Add paritioned FAIL_REP
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Use READ_NODESREQ to query state of other QMGR (instead of CM_REGREQ)
ndb/test/ndbapi/testNodeRestart.cpp:
Require that only starting cluster dies
this also impl. gcp safe multi node shutdown
1) block gcp
2) wait for ongoing gcp
3) inform all stopping QMGR's (so that they don't start with error handler)
4) wait for all QMGR's to reply
5) broadcast failrep for stopping nodes
6) (if !master died) unblock gcp
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/include/kernel/signaldata/FailRep.hpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/include/kernel/signaldata/StopReq.hpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/qmgr/Qmgr.hpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/qmgr/QmgrInit.cpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Impl. GCP safe multi node shutdown in order to test bug#18612
ndb/test/ndbapi/testNodeRestart.cpp:
test program for bug#18612
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
mysql-test/lib/mtr_timer.pl:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
post merge fixes
ndb/include/mgmapi/ndbd_exit_codes.h:
post merge
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
post merge
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
post merge
ndb/src/kernel/error/ndbd_exit_codes.c:
post merge
ndb/tools/desc.cpp:
post merge
into perch.ndb.mysql.com:/home/jonas/src/50-work
mysql-test/lib/mtr_timer.pl:
Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
ndb/src/ndbapi/NdbTransaction.cpp:
Auto merged
ndb/src/ndbapi/TransporterFacade.hpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/Makefile.am:
Auto merged
ndb/test/src/NdbRestarter.cpp:
Auto merged
sql/ha_innodb.cc:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
merge
ndb/src/ndbapi/Ndbif.cpp:
merge
ndb/src/ndbapi/TransporterFacade.cpp:
merge
ndb/test/ndbapi/testTimeout.cpp:
merge
ndb/test/run-test/daily-basic-tests.txt:
merge
ndb/tools/desc.cpp:
merge
Partial system restart, can not try to start with higher GCI that own
even if knowing about a higher number
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Add new dump for setting time between gcp
ndb/include/kernel/signaldata/StartPerm.hpp:
Move error codes into StartPerm + Add new error code
ndb/src/kernel/blocks/ERROR_codes.txt:
Add new error insert
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Move error codes into StartPerm + Add new error code
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fix so that we don't try to restart to a too new GCI when doing a partial start
Add new error code when this node later tries to join
ndb/test/include/NdbRestarter.hpp:
Add new method for selecting random node
ndb/test/ndbapi/testSystemRestart.cpp:
Add new testcase for bug#18385
ndb/test/run-test/daily-basic-tests.txt:
Run test in daily-basic
ndb/test/src/NdbRestarter.cpp:
Add new method for selecting random node
Activly abort transactions (that's affected) during NF
This removes a lot of bugs that can occur otherwise is using
high value for TransactionDeadLockTimout
ndb/include/kernel/signaldata/TcContinueB.hpp:
New continueb for active transaction abort on nf
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Add bitmask of participating nodes to transaction record
Add bitmask of node fail steps, so that NF_CompleteRep is not sent until all steps has completed
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Active transaction baortion
- Added empty constructors and virtual destructors to many classes and structs
- Removed some usage of the offsetof() macro to instead use C++ class pointers
configure.in:
Added comment
ndb/include/ndbapi/NdbDictionary.hpp:
Fixed compiler warnings from gcc 4.0.2
sql/field.cc:
Fixed compiler warnings from gcc 4.0.2
sql/handler.h:
Fixed compiler warnings from gcc 4.0.2
sql/item.h:
Fixed compiler warnings from gcc 4.0.2
sql/item_cmpfunc.h:
Fixed compiler warnings from gcc 4.0.2
sql/log_event.h:
Fixed compiler warnings from gcc 4.0.2
sql/mysql_priv.h:
Fixed compiler warnings from gcc 4.0.2
For find_table_in_list I fixed it to use proper C++ class pointers instead of C style pointers
sql/opt_range.cc:
Fixed compiler warnings from gcc 4.0.2
sql/parse_file.h:
Fixed compiler warnings from gcc 4.0.2
sql/sp_rcontext.h:
Fixed compiler warnings from gcc 4.0.2
sql/spatial.h:
Fixed compiler warnings from gcc 4.0.2
sql/sql_base.cc:
Fixed compiler warnings from gcc 4.0.2
sql/sql_cache.h:
Fixed compiler warnings from gcc 4.0.2
sql/sql_class.h:
Fixed compiler warnings from gcc 4.0.2
sql/sql_parse.cc:
Fixed compiler warnings from gcc 4.0.2
(Not pretty, but seams to work...)
sql/sql_select.h:
Fixed compiler warnings from gcc 4.0.2
sql/sql_update.cc:
Fixed compiler warnings from gcc 4.0.2
sql/table.h:
Fixed compiler warnings from gcc 4.0.2
sql/tztime.cc:
Fixed compiler warnings from gcc 4.0.2
sql/tztime.h:
Fixed compiler warnings from gcc 4.0.2
Use the POSIX limits.h define of PATH_MAX for maximum path length.
This has been being hit in pushbuild
ndb/include/util/File.hpp:
use PATH_MAX for maximum filename length
ndb/src/common/portlib/NdbConfig.c:
use PATH_MAX for max path name length instead of hardcoding 128
ndb/src/common/util/File.cpp:
use PATH_MAX for maximum filename length
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
ndb/src/common/logger/Logger.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
sql/sql_select.cc:
Auto merged
WL#2703 restart for ndb_mgmd
Solving two problems with one stone.
Allows the stopping and restarting of mgm nodes other than the one the mgmclient
is connected to.
ndb/include/mgmapi/mgmapi.h:
Add the internal ndb_mgm_end_session command.
This will unreserve the nodeid we have allocated synchronously.
Otherwise we can't do a restart of a node really quickly as the nodeids are cleaned
up after the connection to mgmd is closed.
ndb/include/mgmcommon/ConfigRetriever.hpp:
Allow configuration on if end_session is going to be called on object destruction.
We need to set this to false for ndbd as we fork()
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
When destroying ConfigRetreiver, ndb_mgm_end_session - i.e. deallocate the nodeid
ndb/src/common/util/SocketServer.cpp:
When destroying a SocketServer, close the server socket.
ndb/src/kernel/main.cpp:
don't purge allocated resources when cleaning up in parent process (nodeid)
ndb/src/kernel/vm/Configuration.cpp:
have option end_session to closeConfiguration
ndb/src/kernel/vm/Configuration.hpp:
have option end_session to closeConfiguration
ndb/src/mgmapi/mgmapi.cpp:
Implement ndb_mgm_end_session
ndb/src/mgmclient/CommandInterpreter.cpp:
Correct output of STOP as we can now stop mgmd as well as ndbd
ndb/src/mgmsrv/MgmtSrvr.cpp:
Add code into start for connecting to our own mgmd.
Create sendStopMgmd() which does the same job as sendSTOP_REQ, but for ndb_mgmd
Allow stopping of other ndb_mgmd processes by creating a connection to them
and issuing the stop command
When stopping all nodes, stop other ndb_mgmd processes as well.
Remove set_connect_string. Replace with connect_to_self. This is a much better
way of doing things.
ndb/src/mgmsrv/MgmtSrvr.hpp:
add connect_to_self and remove set_connect_string.
ndb/src/mgmsrv/Services.cpp:
Add endSession.
- delete Allocated_resources for this connection
- create new Allocated_resources for this connection
conceivably you could keep the socket open across node restarts (and even
possibly get a different node id). But I wouldn't try it and expect happiness.
ndb/src/mgmsrv/Services.hpp:
Add endSession
ndb/src/mgmsrv/main.cpp:
allow mgmd to be restarted.
- add g_RestartServer flag
- move connecting to our own mgmd into MgmtSrvr (where it belongs)
- output correct Shutdown/Restart message on shutdown/restart
Implement error reporting to Logger and associated classes.
ndb/include/logger/LogHandler.hpp:
Add error string to LogHandler along with error code
ndb/include/logger/Logger.hpp:
Add reporting back of error to addHandler(BaseString).
ndb/src/common/logger/FileLogHandler.cpp:
Implement error reporting
ndb/src/common/logger/LogHandler.cpp:
Implement error reporting.
Trim spaces and tabs out of parameter names. This allows "p=v, param=value"
ndb/src/common/logger/Logger.cpp:
Report back errors when adding a handler via BaseString
ndb/src/common/logger/SysLogHandler.cpp:
Report an error on invalid syslog facility
ndb/src/mgmsrv/MgmtSrvr.cpp:
Report error when adding log handler
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/src/kernel/blocks/ERROR_codes.txt:
merge
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
merge
ndb/test/run-test/daily-basic-tests.txt:
merge
into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes
ndb/include/ndb_version.h.in:
Handle upgrade of bug fix
ndb/src/kernel/blocks/ERROR_codes.txt:
New error code for delaying INCL_NODE_REQ
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a)
by also waiting for starting nodes
ndb/test/ndbapi/testNodeRestart.cpp:
Add testcase for bug#15632
Fix error in NF during NR
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/ERROR_codes.txt:
Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Run updateNodeInfo if failed node is not in list of storedReplicas
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Add dump for ERROR 5002 with specified table
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Add dump for ERROR 5002 with specified table
ndb/test/ndbapi/testNodeRestart.cpp:
Add testcase for bug#15587
ndb/test/run-test/daily-basic-tests.txt:
Add testcase for bug#15587
mysql-test/r/ndb_charset.result:
bug#14007 test [re-commit]
mysql-test/t/ndb_charset.test:
bug#14007 test [re-commit]
ndb/include/kernel/AttributeDescriptor.hpp:
bug#14007 4.1 need getSizeInBytes [re-commit]
ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp:
bug#14007 4.1 *** do not AUTOmerge to 5.0 *** [re-commit]
into mysql.com:/usr/home/bar/mysql-5.0.b12371
mysql-test/t/ctype_utf8.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/ctype_utf8.result:
After merge fix.
mysql-test/r/show_check.result:
After merge fix.
sql/item_strfunc.h:
After merge fix.
tests/mysql_client_test.c:
After merge fix.
ndb/include/kernel/signaldata/DumpStateOrd.hpp:
New dump for index operation count
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
New dump for index operation count
Fix leak on index ops
mysys/Makefile.am:
Added Base64 to mysys
ndb/config/type_ndbapi.mk.am:
NDBAPI now dependent on mysys
ndb/config/type_util.mk.am:
NDB UTIL now dependent on mysys
ndb/src/common/util/Makefile.am:
Remove Base64
ndb/src/common/util/Parser.cpp:
Removed dead code
ndb/src/mgmapi/mgmapi.cpp:
Use of mysys Base64
ndb/src/mgmsrv/Services.cpp:
Use of mysys Base64
include/base64.h:
Making Base64 mysys-style
mysys/base64.c:
Making Base64 mysys-compatible
- ensure in ndb_mgmd that the stop command is not issued if a node is restarting
- added some new error messages
- in ndbcntr on master check so that node does not shutdown id shutdoen in progress
+ revised error messages after feedback
+ revides classifications and status
+ removed all progError(..0..) to make sure all error invocations have an error code
+ added some new error codes to replace some generic usage of SYSTEM_ERROR
+ removed some unused codes
configure.in:
Bug #11749 No message slogan found for Signal 8 received. (need better message)
ndb/include/kernel/signaldata/SystemError.hpp:
+ removed some unused codes
ndb/src/kernel/blocks/dbacc/Dbacc.hpp:
+ removed all progError(..0..) to make sure all error invocations have an error code
ndb/src/kernel/main.cpp:
Bug #11749 No message slogan found for Signal 8 received. (need better message)
- added 2 new error codes for out of data and index memory during SR
+ removed c++ style comments from c file
ndb/include/mgmapi/ndbd_exit_codes.h:
Bug #13197 NDB needs better error message for not enough memory.
- added 2 new error codes for out of data and index memory during SR
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Bug #13197 NDB needs better error message for not enough memory.
- added 2 new error codes for out of data and index memory during SR
ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp:
Bug #13197 NDB needs better error message for not enough memory.
- added 2 new error codes for out of data and index memory during SR
BitKeeper/deleted/.del-ErrorMessages.hpp~9ab815d55a13433a:
Delete: ndb/src/kernel/error/ErrorMessages.hpp
config/ac-macros/ha_ndbcluster.m4:
add ndb mgmapi to ndbcluster_includes
extra/perror.c:
perror to print also ndbd exit codes
ndb/include/Makefile.am:
added new ndbd exit code include file to src distribution
ndb/include/kernel/signaldata/EventReport.hpp:
backported from 5.1, included node id in event report signal
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
backported from 5.1, included node id in event report signal
