summaryrefslogtreecommitdiff
path: root/ndb/src
Commit message (Collapse)AuthorAgeFilesLines
* mergeunknown2005-10-073-340/+0
| | | | | | | | | | | | | | | storage/ndb/src/kernel/error/ndbd_exit_codes.c: Rename: ndb/src/kernel/error/ndbd_exit_codes.c -> storage/ndb/src/kernel/error/ndbd_exit_codes.c storage/ndb/src/kernel/vm/ndbd_malloc.cpp: Rename: ndb/src/kernel/vm/ndbd_malloc.cpp -> storage/ndb/src/kernel/vm/ndbd_malloc.cpp storage/ndb/src/kernel/vm/ndbd_malloc.hpp: Rename: ndb/src/kernel/vm/ndbd_malloc.hpp -> storage/ndb/src/kernel/vm/ndbd_malloc.hpp storage/ndb/test/sql/test_create_drop.pl: Rename: ndb/test/sql/test_create_drop.pl -> storage/ndb/test/sql/test_create_drop.pl storage/ndb/test/sql/test_range_bounds.pl: Rename: ndb/test/sql/test_range_bounds.pl -> storage/ndb/test/sql/test_range_bounds.pl storage/ndb/include/mgmapi/ndbd_exit_codes.h: Rename: storage/ndb/include/ndbd_exit_codes.h -> storage/ndb/include/mgmapi/ndbd_exit_codes.h
* Mergeunknown2005-10-073-0/+340
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUILD/SETUP.sh: Auto merged configure.in: Auto merged BitKeeper/deleted/.del-ErrorMessages.hpp~9ab815d55a13433a: Auto merged ndb/include/mgmapi/ndbd_exit_codes.h: Auto merged ndb/src/kernel/error/ndbd_exit_codes.c: Auto merged sql/ha_innodb.cc: Auto merged sql/log.cc: Auto merged storage/innobase/os/os0sync.c: Auto merged storage/ndb/include/Makefile.am: Auto merged storage/ndb/include/kernel/signaldata/EventReport.hpp: Auto merged storage/ndb/include/kernel/signaldata/FsRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/SystemError.hpp: Auto merged storage/ndb/include/mgmapi/mgmapi.h: Auto merged storage/ndb/src/common/debugger/EventLogger.cpp: Auto merged storage/ndb/src/common/debugger/signaldata/FsRef.cpp: Auto merged storage/ndb/src/kernel/main.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged storage/ndb/src/kernel/blocks/backup/BackupInit.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupSystemRestart.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Auto merged storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.hpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.cpp: Auto merged storage/ndb/src/kernel/blocks/trix/Trix.hpp: Auto merged storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.cpp: Auto merged storage/ndb/src/kernel/error/ErrorReporter.hpp: Auto merged storage/ndb/src/kernel/error/Makefile.am: Auto merged storage/ndb/src/kernel/vm/ArrayPool.hpp: Auto merged storage/ndb/src/kernel/vm/CArray.hpp: Auto merged storage/ndb/src/kernel/vm/ClusterConfiguration.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.cpp: Auto merged storage/ndb/src/kernel/vm/Configuration.hpp: Auto merged storage/ndb/src/kernel/vm/Emulator.cpp: Auto merged storage/ndb/src/kernel/vm/FastScheduler.cpp: Auto merged storage/ndb/src/kernel/vm/Makefile.am: Auto merged storage/ndb/src/kernel/vm/SafeCounter.cpp: Auto merged storage/ndb/src/kernel/vm/SafeCounter.hpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.cpp: Auto merged storage/ndb/src/kernel/vm/SimulatedBlock.hpp: Auto merged storage/ndb/src/kernel/vm/TimeQueue.cpp: Auto merged storage/ndb/src/kernel/vm/TransporterCallback.cpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.cpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.hpp: Auto merged storage/ndb/src/kernel/vm/pc.hpp: Auto merged storage/ndb/src/mgmapi/Makefile.am: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmapi/ndb_logevent.cpp: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-ucs2.c: Auto merged config/ac-macros/ha_ndbcluster.m4: merge extra/perror.c: merge storage/ndb/include/mgmapi/ndb_logevent.h: merge storage/ndb/src/kernel/blocks/suma/SumaInit.cpp: merge storage/ndb/src/mgmsrv/MgmtSrvr.cpp: merge storage/ndb/src/mgmsrv/Services.hpp: SCCS merged
| * ndbd exit code update after reviewunknown2005-10-061-16/+15
| |
| * Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-0677-1039/+1664
| |\ | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 ndb/src/mgmsrv/Services.cpp: Auto merged
| | * Bug #11749 No message slogan found for Signal 8 received. (need better ↵unknown2005-10-0515-275/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | message) + 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)
| | * - to ensure maximum available memory for TUP DataMemunknown2005-10-0435-321/+554
| | | | | | | | | | | | | | | | | | | | | | | | | | | moved all array allocation to READ_CONFIG_REQ (except CMVI which was not possible) reorganized READ_CONFIG_REQ call order in ndb cntr to make sure TUP allocates first moved allocations internally in TUP to allocate DataMem first
| | * Bug#11739 SendBufferMemory set to 294967039 causes core where max = 4294967039unknown2005-10-046-14/+31
| | | | | | | | | | | | | | | | | | | | | - added proper error message on all failed array pool mallocs
| | * Bug #13197 NDB needs better error message for not enough memory.unknown2005-10-033-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| | * added structured ndbd exit codesunknown2005-10-0345-494/+855
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge mysqldev@production.mysql.com:/data0/mysqldev/my/mysql-5.0-releaseunknown2005-10-041-1/+1
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | into serg.mylan:/usr/home/serg/Abk/mysql-5.0 sql/sql_table.cc: Auto merged sql/table.cc: Auto merged
| | * ndb -unknown2005-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | fix solaris problem (dont print null) ndb/src/mgmsrv/Services.cpp: Dont print null address
| * | ndb - mysql-test-run ndb_configunknown2005-10-031-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fix 32/64 bit insecure code ndb/src/mgmsrv/InitConfigFileParser.cpp: Fix 32/64 bit insecure/useless code
| * | ndb -unknown2005-09-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix compile error with gcc296 ndb/src/common/util/SimpleProperties.cpp: Fix compile error with gcc296
| * | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-306-24/+469
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvrConfig.cpp: Auto merged
| | * Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-09-306-24/+469
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push include/my_sys.h: Auto merged mysys/default.c: Auto merged
| | | * ndb unknown2005-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support/test for using my.cnf [cluster_config] mysql-test/r/ndb_config.result: Add support for ndb_config to read my.cnf mysql-test/t/ndb_config.test: Add support for ndb_config to read my.cnf ndb/src/mgmsrv/InitConfigFileParser.cpp: merge ndb/tools/ndb_config.cpp: Add support for ndb_config to read my.cnf mysql-test/std_data/ndb_config_mycnf1.cnf: New BitKeeper file ``mysql-test/std_data/ndb_config_mycnf1.cnf''
| | | * Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-09-302-9/+16
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 mysql-test/r/ndb_config.result: Auto merged mysql-test/t/ndb_config.test: Auto merged ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged ndb/src/mgmsrv/InitConfigFileParser.hpp: Auto merged ndb/tools/ndb_config.cpp: Auto merged
| | | | * ndb -unknown2005-09-302-9/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add support for reading config.ini from ndb_config (as alternative to contacting ndb_mgmd) mysql-test/r/ndb_config.result: Add support for reading config.ini from ndb_config mysql-test/t/ndb_config.test: Add support for reading config.ini from ndb_config ndb/src/mgmsrv/InitConfigFileParser.cpp: Handle prinouts better ndb/src/mgmsrv/InitConfigFileParser.hpp: Handle prinouts better ndb/tools/ndb_config.cpp: Add support for reading config.ini from ndb_config
| | | * | wl#1882unknown2005-09-306-15/+453
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow ndb_mgmd to use my.cnf for cluster configuration ndb/src/mgmsrv/ConfigInfo.cpp: Depricate Id infavor of nodeid in config.ini ndb/src/mgmsrv/InitConfigFileParser.cpp: Add support for getting cluster config from my.cnf [cluster_config] ndb/src/mgmsrv/InitConfigFileParser.hpp: Add support for getting cluster config from my.cnf [cluster_config] ndb/src/mgmsrv/MgmtSrvr.cpp: Add support for getting cluster config from my.cnf [cluster_config] ndb/src/mgmsrv/MgmtSrvrConfig.cpp: Add support for getting cluster config from my.cnf [cluster_config] ndb/src/mgmsrv/main.cpp: Add support for getting cluster config from my.cnf [cluster_config]
| * | | | more post-merge fixes for SingleUser log eventsunknown2005-09-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/mgmapi/ndb_logevent.h: more post-merge fixes ndb/src/mgmapi/ndb_logevent.cpp: more post-merge fixes
| * | | | merge fixes - SingleUser loggingunknown2005-09-293-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/mgmapi/ndb_logevent.h: Merge fix - add SingleUser log events ndb/src/common/debugger/EventLogger.cpp: merge fix - add text for SingleUser log events. ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: merge fix ndb/src/mgmapi/ndb_logevent.cpp: add SingeUser log info
| * | | | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mainunknown2005-09-2911-1676/+631
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.0/main ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged ndb/src/mgmsrv/Services.cpp: Auto merged ndb/src/mgmsrv/Services.hpp: Auto merged ndb/include/kernel/signaldata/EventReport.hpp: merge ndb/src/common/debugger/EventLogger.cpp: merge ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: merge ndb/src/mgmsrv/MgmtSrvr.cpp: merge
| | * \ \ \ Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mainunknown2005-09-2912-2133/+643
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/mgmd
| | | * | | | Add documentation about intricacies of MgmtSrvr::versionNode and ::statusunknown2005-09-222-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/mgmsrv/MgmtSrvr.cpp: Document why getOwnNodeID==nodeId is different in ::versionNode ndb/src/mgmsrv/MgmtSrvr.hpp: Document the usage of the address pointer returned from status()
| | | * | | | BUG#11595 ndb_mgm shows from IP for second mgmdunknown2005-09-224-13/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG#12037 ndb_mgmd IP address do not show in other ndb_mgmd processes Extend ApiVersionConf to include address. ndb/include/kernel/signaldata/ApiVersion.hpp: Extend ApiVersionConf to include inet_addr. the address used for communication to this node. ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: include connect address in ApiVersionConf ndb/src/mgmsrv/MgmtSrvr.cpp: ::status() now also returns char* address of the node. For API or MGM, this is in ApiVersionConf. For NDB, this is the standard get_connect_address. When sending ApiVersionReq, try to send to a STARTED node (as these have properly joined the cluster and know the connect addresses). If versionNode is called for getOwnNodeId()==nodeId, try to get the address via ApiVersionConf. If that fails, look it up in the configuration. ndb/src/mgmsrv/MgmtSrvr.hpp: Add char **address to prototypes. ndb/src/mgmsrv/Services.cpp: Get the connect address from mgmsrv.status()
| | | * | | | Remove old and usused configuration locking code.unknown2005-09-207-450/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some new code that does this job is being written against 5.1. This code is largely removed from that work. ndb/include/kernel/GlobalSignalNumbers.h: remove dead (never used) MGM_(UN)LOCK signal numbers ndb/src/mgmsrv/Config.cpp: remove unused generation number code. remove unused Config::change ndb/src/mgmsrv/Config.hpp: remove unused generation number prototypes. ndb/src/mgmsrv/MgmtSrvr.cpp: remove unused getPrimaryNode ndb/src/mgmsrv/MgmtSrvr.hpp: remove prototypes for config lock and commit/rollback. ndb/src/mgmsrv/MgmtSrvrConfig.cpp: remove CONFIG (UN)LOCK signals, lockConf/unlockConf, commit/rollback and changeConfig. never used. ndb/src/mgmsrv/Services.cpp: remove unused configuration locking code ndb/src/mgmsrv/Services.hpp: remove usused configuration locking code
| | | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-mgmdunknown2005-09-158-1686/+589
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/mgmd
| | | | * | | | corrected prev patch on ndb_mgmd usage of SignalSenderunknown2005-09-132-5/+17
| | | | | | | |
| | | | * | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-128-1695/+586
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1 ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged
| | | | | * | | | adopted to corrected ndb SendSignal Node failrepunknown2005-09-121-6/+15
| | | | | | | | |
| | | | | * | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-128-1695/+577
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | | | | * | | | reengineered ndb_mgmd to use SignalSender and remove some multi user issuesunknown2005-09-128-1695/+577
| | | | | | | | | |
| | * | | | | | | | Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-272-12/+11
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| | * \ \ \ \ \ \ \ \ Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-221-4/+4
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| | * | | | | | | | | GCC4 build fixunknown2005-09-221-0/+1
| | | | | | | | | | |
| * | | | | | | | | | ndb - printSchemaFile: more checks and optionsunknown2005-09-281-51/+117
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp: more checks and options
| * | | | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1unknown2005-09-282-4/+11
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0 client/mysql.cc: Auto merged client/mysqltest.c: Auto merged mysql-test/mysql-test-run.pl: Auto merged mysql-test/r/mysqltest.result: Auto merged mysql-test/t/mysqltest.test: Auto merged mysys/my_init.c: Auto merged sql/sql_update.cc: Auto merged Makefile.am: Manual merge mysql-test/r/cast.result: Manual merge mysql-test/t/cast.test: Manual merge ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp: Manual merge sql/ha_ndbcluster.cc: Manual merge sql/item.h: Manual merge sql/opt_sum.cc: Manual merge sql/sql_delete.cc: Manual merge sql/sql_lex.cc: Manual merge sql/sql_load.cc: Manual merge sql/sql_prepare.cc: Manual merge
| | * | | | | | | | added make target for printSchemaFileunknown2005-09-262-12/+11
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-09-221-4/+4
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
| | * | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-09-221-4/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 mysql-test/r/ndb_alter_table.result: Auto merged mysql-test/t/ndb_alter_table.test: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged
| | | * | | | | | bug#13316unknown2005-09-221-4/+4
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb alter table with big dicttabinfo send alter_tab_req fragmented as signal can get larger than MAX_MESSAGE_SIZE ndb/src/kernel/blocks/dbdict/Dbdict.cpp: DictTabInfo used during alter table can easily becom larger than MAX_MESSAGE_SIZE send fragmented instead
| * | | | | | | GCC4 build fixunknown2005-09-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/NdbUtil.hpp: gcc4 build fix
| * | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-09-221-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
| | * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-09-221-0/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 ndb/src/ndbapi/Ndbinit.cpp: Auto merged
| | | * | | | | ndb - fix gcc4 compile problemunknown2005-09-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/Ndbinit.cpp: fix gcc4 compile problem
| * | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-09-211-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
| | * | | | | | ndb merge fixunknown2005-09-211-2/+1
| | | | | | | |
| | * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-09-212-1/+3
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: merge
| | | * | | | | bug#12950unknown2005-09-213-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb backup with charsets and simultanious updates make sure that backup _dont_ read xfrm data ndb/src/kernel/blocks/backup/Backup.cpp: Backup can do dirty read ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Fix so that backup dont read xfrm data ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: Fix so that backup dont read xfrm data
| * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-201-2/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push
View Lorry Controller Status