delta/mariadb-git.git - github.com: MariaDB/server.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	get mgmapi error codes into perror	unknown	2007-06-14	3	-101/+140
\| \| \| \| \|	storage/ndb/include/mgmapi/mgmapi_error.h: New BitKeeper file ``storage/ndb/include/mgmapi/mgmapi_error.h''
*	move all error codes to ndberror.c	unknown	2007-06-14	4	-114/+64
\| \| \| \| \| \| \| \|	- step 1 mgmtsrvr error codes storage/ndb/src/mgmsrv/ndb_mgmd_error.h: New BitKeeper file ``storage/ndb/src/mgmsrv/ndb_mgmd_error.h''
*	fix build of mgm client with history - caught by pb.	unknown	2007-06-14	1	-0/+6
\| \| \| \| \|	storage/ndb/src/mgmclient/main.cpp: fix build issues only caught by pb (mgm client history related)
*	[PATCH] add knielsen as MAINTAINER of NDBAPI NdbRecord examples	unknown	2007-06-13	1	-0/+6
\| \| \| \| \| \| \| \| \|	Index: ndb-merge/storage/ndb/MAINTAINERS =================================================================== storage/ndb/MAINTAINERS: add knielsen as MAINTAINER of NDBAPI NdbRecord examples
*	[PATCH] Add MAINTAINERS file for NDB	unknown	2007-06-13	1	-0/+157
\| \| \| \| \| \| \| \| \|	Index: ndb-merge/storage/ndb/MAINTAINERS =================================================================== storage/ndb/MAINTAINERS: Add MAINTAINERS file for NDB
*	[PATCH] BUG#29074 preserve file timestamps in ndb_error_reporter	unknown	2007-06-13	1	-2/+2
\| \| \| \| \| \| \| \| \|	Index: ndb-work/storage/ndb/tools/ndb_error_reporter =================================================================== storage/ndb/tools/ndb_error_reporter: BUG#29074 preserve file timestamps in ndb_error_reporter
*	[PATCH] Enable test for (Closed) bug 16445	unknown	2007-06-13	2	-10/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug was updated on May 30th by Tomas to say that hasn't been seen in PB since global dict cache rewrite. This test should probably be enabled then. Index: ndb-work/mysql-test/t/ndb_basic.test =================================================================== mysql-test/r/ndb_basic.result: Enable test for (Closed) bug 16445 mysql-test/t/ndb_basic.test: Enable test for (Closed) bug 16445
*	[PATCH] BUG#29073 Store history for ndb_mgm	unknown	2007-06-13	1	-0/+21
\| \| \| \| \| \| \| \| \|	Index: ndb-work/storage/ndb/src/mgmclient/main.cpp =================================================================== storage/ndb/src/mgmclient/main.cpp: BUG#29073 Store history for ndb_mgm
*	[PATCH] Add tests for ndb variables (related to BUG#26675)	unknown	2007-06-13	2	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is somewhat related to BUG#26675 (ndb_connectstring not reported in show global variables) Index: ndb-work/mysql-test/r/ndb_basic.result =================================================================== mysql-test/r/ndb_basic.result: Add tests for ndb variables (related to BUG#26675) mysql-test/t/ndb_basic.test: Add tests for ndb variables (related to BUG#26675)
*	[PATCH] Disable mysql_upgrade test (Bug#28560)	unknown	2007-06-13	1	-0/+1
\| \| \| \| \| \| \| \| \|	Index: ndb-work/mysql-test/t/disabled.def =================================================================== mysql-test/t/disabled.def: Disable mysql_upgrade test (Bug#28560)
*	[PATCH] BUG#29063 mgmapi: connect timeout set incorrectly	unknown	2007-06-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|	correctly divide timeout by 1000 to convert to seconds for SocketClient Index: ndb-work/storage/ndb/src/mgmapi/mgmapi.cpp =================================================================== storage/ndb/src/mgmapi/mgmapi.cpp: BUG#29063 mgmapi: connect timeout set incorrectly
*	[PATCH] BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly	unknown	2007-06-13	2	-0/+79
\| \| \| \| \| \| \| \| \| \| \| \| \|	Add test to testMgm for Connect timeout. add to autotest. Index: ndb-work/storage/ndb/test/ndbapi/testMgm.cpp =================================================================== storage/ndb/test/ndbapi/testMgm.cpp: BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly storage/ndb/test/run-test/daily-basic-tests.txt: BUG#29063 TESTCASE mgmapi: connect timeout set incorrectly
*	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca	unknown	2007-06-12	6	-0/+61
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged
\| *	Bug#29044 - memory buddy allocator "unoptimal" memory handling	unknown	2007-06-12	5	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	- add config param to have better behavior with large tables
\| *	extend backup dump to give more info	unknown	2007-06-12	1	-0/+35
\| \|
* \|	Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca	unknown	2007-06-12	2	-25/+83
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp: merge
\| *	ndb - bug#29044	unknown	2007-06-12	2	-25/+83
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve buddy high order allocation Make removeCommonArea O(1) instead of O(N) Add limit to left/right search storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp: Add info to buddy module test about 1) loops being made in buddy 2) how much was allocated storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp: 1) make removeCommonArea o(1) - as list is (after fix) double linked anyway 2) set page_state = ZFREE_COMMON insertCommonArea and ~ZFREE_COMMON in removeCommonArea 3) add max loops in search left/right 4) add more debug info
* \|	make function static	unknown	2007-06-11	2	-2/+2
\| \|
* \|	change include file	unknown	2007-06-11	1	-2/+1
\| \|
* \|	internal interface to ndb (to be used by e.g. ndb_restore)	unknown	2007-06-11	3	-1/+30
\| \| \| \| \| \| \| \| \| \|	storage/ndb/src/ndbapi/ndb_internal.hpp: New BitKeeper file ``storage/ndb/src/ndbapi/ndb_internal.hpp''
* \|	ndb - bug#28724 for blobs, op flag to not set error on trans (fix, recommit)	unknown	2007-06-08	3	-2/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	storage/ndb/include/ndbapi/NdbOperation.hpp: add NdbOperation option m_noErrorPropagation. If AO_IgnoreError and it are set then operation error does not set error code on transaction. Private, and used by NdbBlob.cpp only. storage/ndb/src/ndbapi/NdbBlob.cpp: add NdbOperation option m_noErrorPropagation. If AO_IgnoreError and it are set then operation error does not set error code on transaction. Private, and used by NdbBlob.cpp only. storage/ndb/src/ndbapi/NdbOperation.cpp: add NdbOperation option m_noErrorPropagation. If AO_IgnoreError and it are set then operation error does not set error code on transaction. Private, and used by NdbBlob.cpp only.
* \|	Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca	unknown	2007-06-05	24	-148/+428
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb mysql-test/ndb/ndb_config_2_node.ini: Auto merged storage/ndb/include/ndb_global.h.in: Auto merged storage/ndb/src/common/portlib/NdbTick.c: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/restore.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/tools/restore/Restore.cpp: Auto merged
\| *	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca	unknown	2007-06-05	24	-148/+428
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca mysql-test/ndb/ndb_config_2_node.ini: Auto merged storage/ndb/include/mgmapi/mgmapi_config_parameters.h: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: manual merge
\| \| *	Bug #28751 Lots of memory locked in memory causes high kswapd	unknown	2007-06-05	18	-77/+279
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- add odirect option for lcp+backup+redo log to lower CPU/kswapd usage - writing odirect removes need for kernel write buffers avoiding kswapd to kick in mysql-test/ndb/ndb_config_2_node.ini: run mysql-test-run using ODirect storage/ndb/include/mgmapi/mgmapi_config_parameters.h: add new config parameter to choose ODirect storage/ndb/include/ndb_global.h.in: specify alignment needed for odirect storage/ndb/src/kernel/blocks/backup/Backup.cpp: read odirect config param open LCP and Backup datafiles with odirect if specified insert empty padding record if odirect is used allocate buffers aligned to be able to use odirect storage/ndb/src/kernel/blocks/backup/Backup.hpp: odirect and padding options storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp: add empty_record in file format storage/ndb/src/kernel/blocks/backup/BackupInit.cpp: read odirect config and allocate aligned storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp: correct debug printouts storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: read odirect config param and align buffers storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: read odirect config param and align buffers storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: read config params and open redo log files with odirect if set storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp: aligned writing for odirect correct odirect open options with test+fallback if odirect fails storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp: align + odirect check storage/ndb/src/kernel/blocks/restore.cpp: restor block to ignore new lcp padding empty_record storage/ndb/src/kernel/vm/SimulatedBlock.cpp: alligend log buffer allocation for odirect storage/ndb/src/kernel/vm/SimulatedBlock.hpp: alligend log buffer allocation for odirect storage/ndb/src/mgmsrv/ConfigInfo.cpp: new config param for odirect, default false storage/ndb/tools/restore/Restore.cpp: ndb_restore to skip empty_record alignment padding in backup file
\| \| *	Bug #28899 not possible to set separate watchdog timeout at startup	unknown	2007-06-05	10	-71/+149
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	storage/ndb/include/mgmapi/mgmapi_config_parameters.h: add new configuration parameter TimeBetweenWatchDogCheckInitial storage/ndb/include/portlib/NdbTick.h: enable timing code storage/ndb/src/common/portlib/NdbTick.c: enable timing code storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: read watchdog timeout to set it after malloc storage/ndb/src/kernel/vm/Configuration.cpp: read initial watchdog timeout and set it in the beginning storage/ndb/src/kernel/vm/Configuration.hpp: read initial watchdog timeout and set it in the beginning storage/ndb/src/kernel/vm/SimulatedBlock.cpp: introduce new state for "action" malloc of memory storage/ndb/src/kernel/vm/SimulatedBlock.hpp: introduce new state for "action" malloc of memory storage/ndb/src/kernel/vm/WatchDog.cpp: rewrite watchdog to check every 100ms for being stuch, but keep shutdown after 3 * interval for "action" == 9 (malloc) keep old behavior and only output every interval storage/ndb/src/mgmsrv/ConfigInfo.cpp: add new configuration parameter TimeBetweenWatchDogCheckInitial
* \| \|	Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca	unknown	2007-06-04	1	-6/+24
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged
\| * \|	ndb - bug#28726	unknown	2007-06-04	1	-6/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	make sure to remove LCP files aswell if specifying --initial storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Add removal of LCP/X directories
* \| \|	ndb -	unknown	2007-06-04	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update dl145a config for autotest storage/ndb/test/run-test/conf-dl145a.cnf: update dl145a config for autotest
* \| \|	Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca	unknown	2007-06-04	8	-125/+195
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb mysql-test/ndb/ndb_config_1_node.ini: Auto merged mysql-test/ndb/ndb_config_2_node.ini: Auto merged storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged
\| * \|	ndb - make size of redo log files (fragment log files) configurable	unknown	2007-06-04	8	-125/+196
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	using new config variable FragmentLogFileSize (4M - 1G) mysql-test/ndb/ndb_config_1_node.ini: change log file size (test) mysql-test/ndb/ndb_config_2_node.ini: change log file size (test) storage/ndb/include/mgmapi/mgmapi_config_parameters.h: add new confif parameter storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: make logfile size configurable storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: make logfile size configurable storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: make logfile size configurable storage/ndb/src/mgmsrv/ConfigInfo.cpp: add new config variable storage/ndb/src/ndbapi/ndberror.c: update error message
* \|	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca	unknown	2007-06-03	1	-0/+7
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user storage/ndb/src/kernel/blocks/pgman.cpp: Auto merged
\| *	Bug#20612.	unknown	2007-06-03	1	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	storage/ndb/src/kernel/blocks/pgman.cpp: a) in one case pl_queue.remove(ptr) was not followed by state &= ~ Page_entry::ONQUEUE. b) when collecting initial hot entries have to remove from queue if somehow got there. b) is easy to get with large buffer cache (256M). a) or b) is probably cause of bug#20612.
* \|	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca	unknown	2007-05-30	1	-0/+1
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user storage/ndb/src/common/transporter/Packer.cpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.hpp: Auto merged storage/ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/test/ndbapi/testNdbApi.cpp: manual merge
\| *	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca	unknown	2007-05-30	2	-0/+5
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca storage/ndb/src/common/transporter/Packer.cpp: Auto merged storage/ndb/src/common/transporter/TCP_Transporter.hpp: Auto merged storage/ndb/test/ndbapi/testNdbApi.cpp: Auto merged storage/ndb/src/common/transporter/TransporterRegistry.cpp: manual merge storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: manual merge storage/ndb/test/run-test/daily-basic-tests.txt: manual merge
\| \| *	Bug #28443	unknown	2007-05-30	6	-19/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- correction of merge error
* \| \|	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca	unknown	2007-05-30	11	-14/+20
\|\ \ \ \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp: Auto merged
\| * \|	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca	unknown	2007-05-30	1	-1/+7
\| \|\ \ \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged
\| \| *	Bug #28770 file already opened error when corrupt schema file	unknown	2007-05-30	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- make sure we close the first file, before opening the next
\| * \|	shorten some files for tar to work	unknown	2007-05-29	10	-13/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp: Rename: storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index.cpp -> storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp: Rename: storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp: Rename: storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp -> storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp: Rename: storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp -> storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp: Rename: storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual.cpp -> storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
\| * \|	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca	unknown	2007-05-29	1	-0/+8
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
* \| \ \	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb	unknown	2007-05-30	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: manual merge
\| * \| \| \|	Bug #28749 MaxNoOfOpenFiles offset by 1	unknown	2007-05-30	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca	unknown	2007-05-28	1	-0/+8
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
* \| \| \| \|	Bug #26783 replication status unknown after cluster or mysqld failure	unknown	2007-05-29	2	-3/+0
\| \| \| \| \|
* \| \| \| \|	Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb	unknown	2007-05-29	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
\| * \ \ \ \	Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gca	unknown	2007-05-29	1	-1/+1
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb 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/dbtup/DbtupScan.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged
\| \| * \| \| \|	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gca	unknown	2007-05-29	13	-33/+243
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca 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/dbtup/DbtupScan.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged
\| \| * \ \ \ \	Merge perch.ndb.mysql.com:/home/jonas/src/50-work	unknown	2007-05-29	1	-1/+1
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca storage/ndb/test/run-test/daily-basic-tests.txt: merge
\| \| \| * \ \ \ \	Merge perch.ndb.mysql.com:/home/jonas/src/41-work	unknown	2007-05-29	1	-1/+1
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into perch.ndb.mysql.com:/home/jonas/src/50-work ndb/test/run-test/daily-basic-tests.txt: merge
\| \| \| \| * \| \| \| \|	ndb - fix typo	unknown	2007-05-29	1	-1/+1
\| \| \| \| \| \| \| \| \|