summaryrefslogtreecommitdiff
path: root/ndb
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/users/lthalmann/bkroot/mysql-5.0unknown2005-10-101-2/+6
|\ | | | | | | | | | | | | into mysql.com:/users/lthalmann/bk/mysql-5.0
| * Merge mysql.com:/users/lthalmann/bkroot/mysql-4.1unknown2005-10-101-2/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/users/lthalmann/bk/mysql-5.0 myisam/mi_rkey.c: Auto merged mysql-test/r/subselect2.result: Auto merged mysql-test/t/select.test: Auto merged ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged scripts/make_binary_distribution.sh: Auto merged configure.in: After merge fixes myisam/mi_search.c: After merge fixes mysql-test/r/select.result: After merge fixes sql/item.cc: After merge fixes sql/sql_parse.cc: After merge fixes sql/sql_update.cc: After merge fixes
| | * Bug #13611 double [TCP DEFAULT] in config.ini crashes ndb_mgmdunknown2005-10-101-2/+6
| | | | | | | | | | | | | | | | | | | | | - Added error printout and nice exit for duplicate default sections
| | * make_binary_distribution.sh:unknown2005-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected platform name output Services.cpp: Dont print null address (back port from 5.0) ndb/src/mgmsrv/Services.cpp: Dont print null address (back port from 5.0) scripts/make_binary_distribution.sh: Corrected platform name output
* | | fixed init of variables in ndb block constructorsunknown2005-10-104-1/+45
|/ /
* | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 ndb/src/mgmsrv/Services.cpp: Auto merged
| * | pthread_handler_decl() changed to be ctags-friendlyunknown2005-10-081-1/+1
| | | | | | | | | | | | | | | | | | | | | (and contain extern "C" when necessary)
* | | added missing signal to VoidFsunknown2005-10-072-0/+17
| | |
* | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-062-0/+397
|\ \ \ | |/ / | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
| * | Merge msdesk.(none):/home/msvensson/mysql-4.1unknown2005-10-062-0/+397
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into msdesk.(none):/home/msvensson/mysql-5.0 BUILD/SETUP.sh: Auto merged BitKeeper/deleted/.del-ctype-cp932.c: Auto merged BitKeeper/deleted/.del-ctype_cp932.result: Auto merged BitKeeper/deleted/.del-ctype_cp932.test: Auto merged BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74: Auto merged innobase/os/os0sync.c: Auto merged mysql-test/r/ctype_tis620.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/ctype_utf8.result: Auto merged mysql-test/t/ctype_uca.test: Auto merged mysql-test/t/ctype_ucs.test: Auto merged mysql-test/t/ctype_ujis.test: Auto merged mysql-test/t/ctype_utf8.test: Auto merged sql/ha_innodb.cc: Auto merged sql/item_cmpfunc.cc: Auto merged strings/ctype-big5.c: Auto merged strings/ctype-gbk.c: Auto merged strings/ctype-simple.c: Auto merged strings/ctype-sjis.c: Auto merged strings/ctype-ucs2.c: Auto merged client/mysql.cc: Sam change in both 4.1 and 5.0 mysql-test/r/ctype_uca.result: Merge mysql-test/r/ctype_ujis.result: Merge strings/ctype-mb.c: Merge strings/ctype-tis620.c: Merge
| | * ndb - prelim perl scripts to autotestunknown2005-10-062-0/+397
| | | | | | | | | | | | | | | BitKeeper/deleted/.del-ndb_range_bounds.pl~ff7e47a35fb44c74: Delete: mysql-test/ndb/ndb_range_bounds.pl
| | * Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-09-303-68/+120
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
| | | * ndb_configunknown2005-09-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check returnvalue on load/fetch configuration ndb/tools/ndb_config.cpp: Check returnvalue on load/fetch configuration
* | | | ndbd exit code update after reviewunknown2005-10-061-16/+15
| | | |
* | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-0684-1057/+1878
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | 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-0517-286/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-034-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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-0351-509/+1056
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-09-3028-1832/+1833
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hartmut/projects/mysql/dev/5.0 ndb/tools/ndb_config.cpp: Auto merged
| * | | | 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-307-82/+586
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-307-82/+586
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-303-70/+117
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-303-70/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-294-5/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2916-1689/+1081
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/mgmdunknown2005-09-292-0/+438
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| | | * \ \ \ Merge mysql.com:/home/stewart/Documents/MySQL/4.1/wl2779unknown2005-09-292-0/+438
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/main
| | | | * | | | WL#2779 ndb_size.plunknown2005-09-141-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug reported by Adam Dixon - table name needs quoting. ndb/tools/ndb_size.pl: Always quote the table and database names when sending to cluster.
| | | | * | | | W#2776 Utility for calculating storage requirements for NDBunknown2005-09-122-0/+435
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial ndb_size.pl Connects to an existing MySQL database and produces a XHTML document containing an estimation of storage requirements. ndb/tools/ndb_size.pl: Initial checkin of ndb_size.pl ndb/tools/ndb_size.tmpl: Initial checkin of XHTML template file for ndb_size.pl
| | * | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mainunknown2005-09-2916-2149/+658
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-225-16/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-208-458/+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-1511-1691/+602
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1211-1700/+599
| | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1211-1700/+590
| | | | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | | | | | * | | | | reengineered ndb_mgmd to use SignalSender and remove some multi user issuesunknown2005-09-1211-1700/+590
| | | | | | | | | | |
| | * | | | | | | | | 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