into dev3-138.dev.cn.tlan:/home/zhl/mysql/mysql-5.0/bug21052
ndb/src/mgmclient/CommandInterpreter.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
Modify error message from "Start of backup failed" to "Backup failed" when backup is aborted
ndb/src/mgmsrv/Services.cpp:
Append error message when error event occour
ndb/src/ndbapi/ndberror.c:
Mofidy error message from "Backup aborted by applicaton" to "Backup aborted by user request"
ndb/src/mgmclient/CommandInterpreter.cpp:
Not start event thread when ndb_mgm client is running in executing (-e) mode.
ndb/src/mgmclient/main.cpp:
Not start event thread when ndb_mgm is runing in executing (-e) mode.
ndb/src/mgmclient/ndb_mgmclient.hpp:
Not start event thread when ndb_mgm is running in executing (-e) mode.
into dev3-127.(none):/mnt/mysql/home/ngb/mysql-5.0-ndb-bj
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/table.cc:
Auto merged
few cases not handled properly (NF occurs).
ndb/src/kernel/blocks/backup/Backup.cpp:
Don't write fragment info if we haven't retreived any fragment info yet
(FailMaster test 2)
Go directly onto closing files if the tabPtr is RNIL (as we're in recovery)
ndb/src/mgmsrv/ConfigInfo.cpp:
add maximum node number judging in transformNode
ndb/src/mgmsrv/MgmtSrvr.cpp:
if configure filename isnot null, display it
fixups after review by jonas
ndb/src/mgmclient/CommandInterpreter.cpp:
Guard the print mutex when running SHOW
ndb/src/mgmsrv/MgmtSrvr.cpp:
replace global_flag_send_heartbeat_now with forceHB()/updateStatus()
don't use bitmask as parameter to forceHB to reflect reality of what the
function does.
remove get_connected_ndb_nodes() as it is no longer used
ndb/src/mgmsrv/MgmtSrvr.hpp:
remove unused get_connected_ndb_nodes()
update updateStatus prototype
ndb/src/mgmsrv/Services.cpp:
use new prototype for updateStatus() - doesn't accept NodeBitmask
ndb/src/ndbapi/ClusterMgr.cpp:
remove global_flag_send_heartbeat_now, replace with forceHB.
compute bitmask of nodes to send HB to in forceHB
ndb/src/ndbapi/ClusterMgr.hpp:
update prototype for forceHB, don't give the illusion that NodeBitmask means much.
into willster.(none):/home/stewart/Documents/MySQL/5.0/bug13985
ndb/src/mgmsrv/MgmtSrvr.cpp:
Auto merged
ndb/src/mgmsrv/MgmtSrvr.hpp:
Auto merged
ndb/src/mgmsrv/Services.cpp:
Auto merged
ndb/src/mgmclient/CommandInterpreter.cpp:
manually merge parameter to pass print mutex to event thread
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
configure.in:
Auto merged
client/mysql.cc:
Auto merged
client/mysqldump.c:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/federated.result:
Auto merged
mysql-test/r/func_time.result:
Auto merged
mysql-test/r/mysql.result:
Auto merged
mysql-test/r/type_ranges.result:
Auto merged
mysql-test/t/func_time.test:
Auto merged
mysql-test/t/mysql.test:
Auto merged
sql/field.cc:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_yacc.yy:
Auto merged
- Since error 1186 is not found among NDB error codes, the message retuned should indicate that.
extra/perror.c:
Move the !found out one level
mysql-test/t/perror.test:
Add test case for bug#16561
ndb/src/kernel/error/ndbd_exit_codes.c:
Check not only for zero size string but also classification "unknown error" when looking for an error mesage for an error code
into moonbone.local:/work/tmp_merge-5.0-opt-mysql
client/mysql.cc:
Auto merged
mysql-test/r/date_formats.result:
Auto merged
mysql-test/r/func_str.result:
Auto merged
mysql-test/t/date_formats.test:
Auto merged
mysql-test/t/func_str.test:
Auto merged
sql/item_strfunc.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/time.cc:
Auto merged
into orca.ndb.mysql.com:/space_old/pekka/ndb/version/my50-1.2167.1.2
ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
ndb/src/kernel/blocks/dbdict/DictLock.txt:
wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/vm/SimulatedBlock.cpp:
wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/src/kernel/vm/SimulatedBlock.hpp:
wait until SL_STARTED before sending DICT_UNLOCK_ORD
ndb/test/run-test/daily-basic-tests.txt:
wait until SL_STARTED before sending DICT_UNLOCK_ORD
- only force HB to data nodes
- flag for if we broadcast condition on receipt of HB
ndb/src/mgmsrv/MgmtSrvr.cpp:
Add get_connected_ndb_nodes to check status for connected data nodes only
ndb/src/mgmsrv/MgmtSrvr.hpp:
add prototype for get_connected_ndb_nodes
ndb/src/mgmsrv/Services.cpp:
only force HB to NDBD nodes
ndb/src/ndbapi/ClusterMgr.cpp:
flag to control if we send the condition
ndb/src/ndbapi/ClusterMgr.hpp:
flag for if we broadcast condition on receipt of hb
ndb/src/kernel/blocks/ERROR_codes.txt:
DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/Dbtup.hpp:
DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp:
DbtupTabDesMan: add merge with left buddies
ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp:
DbtupTabDesMan: add merge with left buddies
ndb/test/ndbapi/testDict.cpp:
DbtupTabDesMan: add merge with left buddies
ndb/test/run-test/daily-basic-tests.txt:
DbtupTabDesMan: add merge with left buddies
use existing transporter mutex
ndb/src/ndbapi/ClusterMgr.cpp:
just use the transporter facade mutex.
parallel 'show' will get woken up at the same time
ndb/src/ndbapi/ClusterMgr.hpp:
remove wait for heartbeat mutex
better support parallel show commands, hold mutex when touching waitForHBFromNodes
ndb/src/ndbapi/ClusterMgr.cpp:
correctly serialize ::forceHB calls and hold mutex for whole time updating
waitForHBFromNodes
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-main
ndb/include/kernel/GlobalSignalNumbers.h:
Auto merged
ndb/src/common/debugger/signaldata/SignalNames.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
Auto merged
Second half of the fix for this bug.
This patch forces a heartbeat to be sent and will wait (a little while)
for replies. This way we can get
> all status
X starting
Y started
X started
>
which is okay as the new status comes after the old status, always.
There is the slimmest of opportunities to get output like above where only half
the cluster appears started.
This is about the best we can do with a command line interactive program.
ndb/src/mgmsrv/MgmtSrvr.cpp:
Add updateStatus method to MgmtSrvr.
Used to force an update of node status for the nodes.
ndb/src/mgmsrv/MgmtSrvr.hpp:
add prototype for updateStatus(NodeBitmask) method
ndb/src/mgmsrv/Services.cpp:
When status is queried, force an update of the status in the mgm server. (i.e. send heartbeats)
ndb/src/ndbapi/ClusterMgr.cpp:
new DEBUG_REG define for debugging registration and HB code.
Add ClusterMgr::forceHB(NodeBitmask) which sends a HB signal to each node in
the bitmask and then waits for a REGCONF from them.
Will only wait for a total of 1 second, not blocking an end client for too long.
On receipt of HB, clear the nodeId in the waiting for bitmask and signal any
waiting threads.
ndb/src/ndbapi/ClusterMgr.hpp:
Add ::forceHB(NodeBitmask) and associated variables
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
ndb/src/kernel/blocks/dblqh/Dblqh.hpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
