into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/src/NdbBackup.cpp:
Auto merged
ndb/test/src/NdbRestarts.cpp:
Auto merged
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert()
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp:
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/ndbapi/testNodeRestart.cpp:
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbBackup.cpp:
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
ndb/test/src/NdbRestarts.cpp:
Change semantic on DumpStateOrd::CmvmiSetRestartOnErrorInsert
Called wo/ args it resets to value in configuration (previously it set to 1 if called wo/ args)
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
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-basic-tests.txt:
Auto merged
remove bug#18385 from autotest as it only works on 2 node clusters
ndb/test/run-test/daily-basic-tests.txt:
remove bug#18385 as it only works on 2 node clusters
minor fixes in test programs
ndb/src/kernel/blocks/ERROR_codes.txt:
Fix conflicting error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Fix conflicting error codes
ndb/test/ndbapi/testNodeRestart.cpp:
Fix test program
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
minor update to ndb-autotest.sh and config files
ndb/test/run-test/conf-daily-devel-ndbmaster.txt:
Add SendBufferMemory to remove rare overruns
ndb/test/run-test/conf-dl145a.txt:
Add SendBufferMemory to remove rare overruns
ndb/test/run-test/conf-ndbmaster.txt:
Add SendBufferMemory to remove rare overruns
ndb/test/run-test/conf-shark.txt:
Add SendBufferMemory to remove rare overruns
ndb/test/run-test/ndb-autotest.sh:
Add support for conf per host
Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding
ndb/src/kernel/blocks/ERROR_codes.txt:
New error code
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
remove dumping of LCP info during NF
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Fix timeout during ABORT when ZABORT_TIMEOUT_BREAK is outstanding
ndb/test/ndbapi/testNodeRestart.cpp:
Add testcase for bug18414
ndb/test/ndbapi/testTimeout.cpp:
Fix error code checking
ndb/test/run-test/daily-basic-tests.txt:
Add testcase for bug18414
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
Remove useless and tricky state fiddleing in TC
to syncronize NF_CompleteRep as code is already present in DIH aswell
Keep broadcast of TAKEOVER_TCCONF for online upgrade
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Add clever dump for showing active operations
ndb/src/kernel/blocks/dbtc/Dbtc.hpp:
Remove useless and tricky state fiddleing in TC
to syncronize NF_CompleteRep as code is already present in DIH aswell
Keep broadcast of TAKEOVER_TCCONF for online upgrade
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Remove useless and tricky state fiddleing in TC
to syncronize NF_CompleteRep as code is already present in DIH aswell
Keep broadcast of TAKEOVER_TCCONF for online upgrade
Use variable waitfor_response_timeout (depending on TransactionDeadLockTimeout)
When getting 4012, set NeedAbort and ReleaseOnClose
ndb/src/ndbapi/NdbConnection.cpp:
Use variable for WAITFOR_RESPONSE_TIMEOUT
ndb/src/ndbapi/Ndbif.cpp:
Use variable timeout for waitfor,
when receiving 4012, set NeedAbort and ReleaseOnClose
ndb/src/ndbapi/TransporterFacade.cpp:
Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT
ndb/src/ndbapi/TransporterFacade.hpp:
Init wait_for_response_timoue as max TRANSACTION_DEADLOCK_TIMEOUT
ndb/test/ndbapi/testTimeout.cpp:
Add testcase for 4012
ndb/test/run-test/daily-basic-tests.txt:
Add testcase for 4012
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
dont't allow node to join cluster until all nodes has completed failure handling
ndb/src/kernel/blocks/qmgr/QmgrMain.cpp:
When getting CM_ADD for node that I haven't completed failure handling for do _not_ just override.
But instead set state...and send CM_ACK_ADD on execCONNECT_REP (much...later)
ndb/test/ndbapi/testNodeRestart.cpp:
testcase for bug#16772
ndb/test/run-test/daily-basic-tests.txt:
Run test in basic suite
8 repeated nr with table wo/ logging cause crash
Dont create crashed replica for temporary tables
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Dont create crashed replica for temporary tables
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Dont create crashed replica for temporary tables
ndb crash if trigger record get to big, fix incorrect max size of trigger record
ndb/src/kernel/blocks/backup/Backup.cpp:
Increase size of max trigger record
ndb crash if trigger record get to big, fix incorrect max size of trigger record
ndb/src/kernel/blocks/backup/Backup.cpp:
Increase size of max trigger record
- 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 perch.ndb.mysql.com:/home/jonas/src/mysql-4.1
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
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/DblqhMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
Introduce new variable c_newest_restorable_gci
which is set _after_ both GCP_SAVE and COPY_GCI
This variable is used when cutting redo (calcKeepGci)
Also make sure complete GCI is run inbetween LCP's
ndb/src/kernel/blocks/dbdih/Dbdih.hpp:
Introduce new variable c_newest_restorable_gci
which is set _after_ both GCP_SAVE and COPY_GCI
This variable is used when cutting redo (calcKeepGci)
Also make sure complete GCI is run inbetween LCP's
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Introduce new variable c_newest_restorable_gci
which is set _after_ both GCP_SAVE and COPY_GCI
This variable is used when cutting redo (calcKeepGci)
Also make sure complete GCI is run inbetween LCP's
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
better error message on invalid config change
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
fix typo
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Change error message...note that this is a guess
ndb/test/ndbapi/testBlobs.cpp:
do batched deletes + list commit across open cursor test cases
ndb/tools/delete_all.cpp:
if blobs, no commit across open cursor (single trans)
cases listed in testBlobs.cpp, analyze later (in 5.0 maybe)
mysql-test/r/ndb_blob.result:
replace+tinyblob back-patch from 5.0
mysql-test/t/ndb_blob.test:
replace+tinyblob back-patch from 5.0
ndb/src/ndbapi/NdbBlob.cpp:
replace+tinyblob back-patch from 5.0
mysql-test/r/ndb_blob.result:
do not delete unknown parts of tinyblob
mysql-test/t/ndb_blob.test:
do not delete unknown parts of tinyblob
ndb/src/ndbapi/NdbBlob.cpp:
do not delete unknown parts of tinyblob
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/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
ndb/src/ndbapi/NdbEventOperationImpl.cpp:
error code 4709 was set outside if()
ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp:
fix opType for detached triggers (accidental miss since v21x?)
ndb/test/ndbapi/Makefile.am:
test_event_merge v5.0
ndb/test/ndbapi/test_event_merge.cpp:
test_event_merge v5.0
into mysql.com:/home/stewart/Documents/MySQL/5.0/main
client/mysql.cc:
Auto merged
myisam/mi_delete.c:
Auto merged
mysql-test/r/fulltext2.result:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
sql/mysqld.cc:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/50-work
ndb/src/kernel/blocks/ERROR_codes.txt:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
Auto merged
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Auto merged
When scan is completed, but lqhkeyreq is outstanding on primary replica and
starting node dies, scan will not be closed leading to error handling of failed
node not completing
ndb/src/kernel/blocks/ERROR_codes.txt:
New error code
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Set scan state to WAIT_LQHKEY_COPY when scan is finished but LQHKEYREQ is outstanding
into mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
into mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
mysql-test/r/ndb_basic.result:
Auto merged
mysql-test/t/ndb_basic.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
ndb/src/kernel/vm/SimulatedBlock.cpp:
merge
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
Error in abort handling in TC when timeout during abort
ndb/src/kernel/blocks/ERROR_codes.txt:
New error codes
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
New error codes
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Dont release transaction record to early
ndb/test/ndbapi/testNodeRestart.cpp:
Test case
ndb/test/run-test/daily-basic-tests.txt:
Test case
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
It will copy from each node the logs and trace dumps (if any) and create
a tarball. Having this tarball attached to a bug report greatly helps
troubleshooting and avoids user error.
It will (optionally) also get the filesystem.
ndb/tools/ndb_error_reporter:
New BitKeeper file ``ndb/tools/ndb_error_reporter''
into mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
Auto merged
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Auto merged
mysql-test/r/update.result:
Auto merged
mysql-test/t/update.test:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
Auto merged
sql/sql_update.cc:
Auto merged
ndb/src/kernel/blocks/backup/Backup.cpp:
If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk,
all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the
error in FSAPPENDCONF is hit.
This would mean that no error code was set for the backup and that it would
be incomplete as not all IO had been written to disk before the node crash.
This would not be reported to the user.
So the backup would appear to succeed but it really didn't.
The window for this is rather small though.
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)
Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.
Makes it easier to grep for senders of signals to specific blocks
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.
fix small error that jonas pointed out that would mean we always die on assert, intsead of just on error
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
fix small error that jonas pointed out that would mean we always die on assert, intsead of just on error
management server performs this check on configuration. If we get this far with something incorrect, something is very wrong.
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
management server performs this check on configuration. If we get this far with something incorrect, something is very wrong.
In the rare circumstance where a mysqld connects to a mgm server, then the
mgm server goes away before a node id can be allocated, it was possible to get
an Error in mgm protocol parser error message.
ndb/src/common/mgmcommon/ConfigRetriever.cpp:
When allocating node id, retry connecting to a management server if it goes away.
ndb/src/mgmapi/mgmapi.cpp:
Treat Eof and NoLine results from the parser as a sign that we should disconnect
from this management server. It's up to the caller to work out if they want
to try again.
into mysql.com:/home/jimw/my/mysql-5.0-clean
client/mysql.cc:
Auto merged
configure.in:
Auto merged
mysql-test/t/mix_innodb_myisam_binlog.test:
Auto merged
mysql-test/r/mix_innodb_myisam_binlog.result:
Resolve conflict
sql/item_func.cc:
Resolve conflict
sql/sql_show.cc:
Resolve conflicts
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]
Add display of minimum requirements for various cluster parameters
e.g. DataMemory, IndexMemory, MaxNoOfTables, MaxNoOfAttributes etc
and the memory usage because of them.
ndb/tools/ndb_size.pl:
Computer minimum parameter settings (MaxNoOfTables, Attributes, Indexes, Triggers) and the memory usage because of these settings.
ndb/tools/ndb_size.tmpl:
display parameters
fix some small bugs, slightly improve output, add --help
ndb/tools/ndb_size.pl:
Provide --help and --usage.
Fix some bugs related to quoting table names.
ndb/tools/ndb_size.tmpl:
A NAME and A HREF to tables from the main list
Makefile.am:
Auto merged
client/Makefile.am:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
libmysqld/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
support-files/Makefile.am:
Auto merged
into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0
ndb/src/ndbapi/NdbRecAttr.cpp:
Auto merged
ndb/src/ndbapi/NdbImpl.hpp:
merge
ndb/src/ndbapi/ndb_cluster_connection.cpp:
merge
memleak when doing ordered index scan on index with column larger than 32 bytes
(recommit for merge to 5.0)
ndb/src/ndbapi/NdbImpl.hpp:
Fix order of free lists so that destructors are run in correct order
ndb/src/ndbapi/NdbRecAttr.cpp:
Dont allocate theStorageX twice
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Destroy mutexes
memleak when doing ordered index scan on index with column larger than 32 bytes
ndb/src/ndbapi/NdbImpl.hpp:
Fix order of free lists so that destructors are run in correct order
ndb/src/ndbapi/NdbRecAttr.cpp:
Dont allocate theStorageX twice
ndb/src/ndbapi/ndb_cluster_connection.cpp:
Destroy mutexes
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
Disable tests of lock upgrade paths that are currently unsupported
ndb/test/ndbapi/testOperations.cpp:
Disable lock upgrade paths that currently unsupported
