summaryrefslogtreecommitdiff
path: root/ndb/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-201-2/+13
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/local/home/marty/MySQL/mysql-5.0
| | | * | | | | | Fix for bug#9896, each fragment has a twin fragment (in 4.1,5.0), pages in ↵unknown2005-09-201-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this were not counted, giving incorrect memory consumption
| * | | | | | | | ndb - post merge fixesunknown2005-09-201-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/ndbapi/NdbTransaction.hpp: post merge fixes ndb/src/ndbapi/Ndblist.cpp: post merge fixes sql/ha_ndbcluster.cc: post merge fixes
| * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-09-2010-453/+309
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 ndb/include/ndbapi/NdbBlob.hpp: Auto merged ndb/include/ndbapi/NdbOperation.hpp: Auto merged ndb/include/ndbapi/NdbRecAttr.hpp: Auto merged ndb/src/ndbapi/NdbApiSignal.cpp: Auto merged ndb/src/ndbapi/NdbApiSignal.hpp: Auto merged ndb/src/ndbapi/NdbBlob.cpp: Auto merged ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged ndb/src/ndbapi/Ndbif.cpp: Auto merged ndb/src/ndbapi/Ndbinit.cpp: Auto merged ndb/test/include/NDBT_Test.hpp: Auto merged ndb/test/ndbapi/bank/BankLoad.cpp: Auto merged ndb/test/ndbapi/testOIBasic.cpp: Auto merged ndb/test/src/NdbBackup.cpp: Auto merged ndb/test/src/NdbRestarts.cpp: Auto merged ndb/tools/restore/Restore.cpp: Auto merged sql/ha_ndbcluster.h: Auto merged sql/sql_yacc.yy: Auto merged ndb/include/ndbapi/Ndb.hpp: merge ndb/include/ndbapi/NdbIndexOperation.hpp: merge ndb/include/ndbapi/NdbIndexScanOperation.hpp: merge ndb/include/ndbapi/NdbTransaction.hpp: merge ndb/src/ndbapi/NdbImpl.hpp: merge ndb/src/ndbapi/Ndblist.cpp: merge ndb/test/src/HugoCalculator.cpp: merge ndb/test/src/NDBT_Test.cpp: merge sql/ha_ndbcluster.cc: merge sql/mysqld.cc: merge sql/sql_lex.h: merge sql/sql_parse.cc: merge
| | * | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-192-14/+22
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push ndb/src/ndbapi/Ndbinit.cpp: Auto merged
| | * \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-09-1710-460/+310
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
| | | * | | | | | | ndbunknown2005-09-1610-460/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | impl support for querying resource usage in ndb api to help track down mem leaks ndb/include/ndbapi/Ndb.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbBlob.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbConnection.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbIndexOperation.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbIndexScanOperation.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbOperation.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbRecAttr.hpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbApiSignal.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbApiSignal.hpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbBlob.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbImpl.hpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbRecAttr.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbUtil.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbUtil.hpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/Ndbif.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/Ndbinit.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/Ndblist.cpp: Impl. reporting of free list usage Put free list into handler class ndb/tools/restore/Restore.cpp: Impl. reporting of free list usage Put free list into handler class
| * | | | | | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1unknown2005-09-192-14/+22
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | / / / / / | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0 mysql-test/mysql-test-run.pl: Auto merged ndb/src/ndbapi/Ndbinit.cpp: Auto merged
| | * | | | | | | bug#9282 - ndb unknown2005-09-192-14/+22
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | big delete from causing NdbObjectIdMap::expand at same time as receiver thread perform getObjectId ndb/src/ndbapi/Ndbinit.cpp: Protect NdbObjectIdMap::expand from getObjectId ndb/src/ndbapi/ObjectMap.hpp: Protect NdbObjectIdMap::expand from getObjectId
| | * | | | | | ndb - bug#9994 backpatch fixes from 5.0unknown2005-09-155-158/+338
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IGNORE on merge 4.1->5.0 ndb/src/kernel/blocks/ERROR_codes.txt: bug#9994 backpatch fixes from 5.0 ndb/src/kernel/blocks/dbdict/Dbdict.cpp: bug#9994 backpatch fixes from 5.0 ndb/src/kernel/blocks/dbdict/Dbdict.hpp: bug#9994 backpatch fixes from 5.0 ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: bug#9994 backpatch fixes from 5.0 ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: bug#9994 backpatch fixes from 5.0
| * | | | | | BUG#13136 NdbTCP.cpp compile failure on OSX 10.2unknown2005-09-152-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use select if poll is unavailable. ndb/src/common/portlib/NdbTCP.cpp: Implement Ndb_check_socket_hup for systems without poll(2) ndb/src/common/portlib/win32/NdbTCP.c: fix typo (found while fixing this bug)
| * | | | | | mergeunknown2005-09-131-0/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | minor compile error fixunknown2005-09-131-0/+2
| | | |/ / / | | |/| | |
| * | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-09-122-5/+10
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean include/my_global.h: Auto merged include/my_pthread.h: Auto merged include/violite.h: Auto merged mysql-test/r/ndb_autodiscover.result: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/ndbapi/SignalSender.cpp: Auto merged sql-common/client.c: Auto merged sql/examples/ha_archive.cc: Auto merged sql/net_serv.cc: Auto merged vio/vio.c: Auto merged vio/viosocket.c: Auto merged vio/viossl.c: Auto merged configure.in: Resolve conflicts
| | * | | | Corrected construct of faked Node fail signals in ndb SignalSenderunknown2005-09-122-5/+10
| | | | | |
| | * | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-121-0/+10
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-4.1-push
| | | * | Merge eel.(none):/home/jonas/src/mysql-4.1unknown2005-09-091-0/+10
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-4.1-push
| * | | \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-121-3/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dl145c.mysql.com:/home/ndbdev/tomas/mysql-5.0 mysql-test/t/rpl_slave_status.test: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged
| | * | | | removed a few aborts from mgmapiunknown2005-09-121-3/+0
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corrected typo in ndb Parser
| * | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-101-0/+10
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-5.0-push
| | * \ \ \ Merge eel.(none):/home/jonas/src/mysql-5.0unknown2005-09-091-0/+10
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-5.0-push
| | | * \ \ \ Merge eel.(none):/home/jonas/src/mysql-4.1unknown2005-09-071-0/+10
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-5.0 ndb/src/common/portlib/NdbThread.c: Auto merged
| | | | * | | ndb - bug#11623 - "ndb become inresponsive but did not really die"unknown2005-09-071-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | block signals in threads making main process get all signals...
| * | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-094-74/+110
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0 ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
| | * | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-081-1/+1
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug12594
| | * | | | Merge mikael@ndb.mysql.com:/home/mikael/bug12594unknown2005-09-084-74/+110
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/mikron/mysql-4.1
| | | * | | | Bug #12594: A few fixesunknown2005-09-083-65/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Fixed a bug and an issue with the added debug code for finding redo log write mistakes ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Fixed a bug and an issue with the added debug code for finding redo log write mistakes Removed a number of unnecessary break's ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp: Added printouts of new debug info in log page header
| | | * | | | Bug #12594:unknown2005-09-083-27/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added debug info to all log page headers
| * | | | | | Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-091-1/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0 ndb/src/ndbapi/SignalSender.cpp: Merge
| | * \ \ \ \ \ Merge mronstrom@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-081-1/+1
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into c-4a09e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/mysql-5.0 mysql-test/r/connect.result: Auto merged mysql-test/t/connect.test: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged sql/sql_class.cc: SCCS merged
| | | * | | | | SignalSender.cpp:unknown2005-09-081-1/+1
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed compile error ndb/src/ndbapi/SignalSender.cpp: fixed compile error
| | | * | | | corrected typounknown2005-09-081-0/+1
| | | | | | |
| | | * | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-088-185/+550
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| * | | | | | Fix -ansi -pedantic compilation failure.unknown2005-09-091-2/+2
| |/ / / / /
| * | | | | corrected typeunknown2005-09-081-0/+1
| | | | | |
| * | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2005-09-088-185/+550
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 ndb/src/kernel/main.cpp: Auto merged ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged ndb/src/ndbapi/Makefile.am: Auto merged ndb/test/src/NdbBackup.cpp: Auto merged
| | * | | | corrected printouts in backup testunknown2005-09-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/backup/Backup.hpp: missed this file in prev commit ndb/test/src/NdbBackup.cpp: corrected printouts in backup test
| | * | | | corrected prev fix for bug #13054unknown2005-09-081-33/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that _only_ backup master replies to API
| | * | | | Bug #13054 start backup command return may be interrptedunknown2005-09-087-155/+514
| | | | | |
| | * | | | Modified ndb log message on startup failureunknown2005-09-071-1/+1
| | | |_|/ | | |/| |
| * | | | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607unknown2005-09-081-2/+24
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.0/bug11607 ndb/src/ndbapi/NdbTransaction.cpp: SCCS merged
| | * | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mainunknown2005-09-081-2/+24
| | |\ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/bug11607
| | | * BUG#11607 Incorrect error code returned on deletionunknown2005-09-021-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save error on first failure. At end of execute, if the current error is 4350 (transaction already aborted), restore the original error (if there was one). ndb/src/ndbapi/NdbConnection.cpp: In NdbConnection::execute - returning 4350 instead of correct error. Save error on first failure. At end of execute, if the current error is 4350 (transaction already aborted), restore the original error (if there was one).
| * | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-09-059-41/+121
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 client/mysqltest.c: Auto merged mysql-test/r/func_gconcat.result: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/func_gconcat.test: Auto merged mysql-test/t/mysqltest.test: Auto merged ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged ndb/src/kernel/error/ErrorReporter.cpp: Auto merged ndb/src/kernel/main.cpp: Auto merged ndb/src/kernel/vm/Emulator.cpp: Auto merged ndb/src/kernel/vm/Emulator.hpp: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/mgmsrv/Services.cpp: Auto merged ndb/tools/ndb_config.cpp: Auto merged ndb/tools/restore/consumer_restore.cpp: Auto merged mysql-test/t/openssl_1.test: Manual merge ndb/include/util/ndb_opts.h: Manual merge ndb/tools/Makefile.am: Manual merge ndb/tools/restore/restore_main.cpp: Manual merge
| | * | added --core-file option to ndb executablesunknown2005-09-054-38/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | added parseable printout in ndb_restore
| | * | Bug #12992 Cluster StopOnError = Y restarts ndbd indefinitlyunknown2005-09-056-3/+67
| | | |
| * | | Merge mysql.com:/usr/home/ram/work/4.1.b4214unknown2005-09-055-21/+38
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/usr/home/ram/work/mysql-5.0 myisam/mi_check.c: Auto merged myisam/mi_packrec.c: Auto merged myisam/mi_static.c: Auto merged myisam/myisamdef.h: Auto merged ndb/src/kernel/main.cpp: Auto merged ndb/src/kernel/vm/Emulator.cpp: Auto merged myisam/myisampack.c: merging
| | * | added timestamp to shutdown messages in ndbdunknown2005-09-052-13/+15
| | | |
| | * | fixed small bug in ndb redolog printerunknown2005-09-053-8/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + added option to dumpe rest of page after exnd of data ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp: fixed small bug in ndb redolog printer ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp: fixed small bug in ndb redolog printer
| * | | Merge eel.(none):/home/jonas/src/mysql-4.1unknown2005-09-025-7/+40
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into eel.(none):/home/jonas/src/mysql-5.0 ndb/include/kernel/signaldata/SignalData.hpp: Auto merged ndb/src/common/debugger/signaldata/SignalDataPrint.cpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/common/debugger/EventLogger.cpp: merge
View Lorry Controller Status