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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-19651	unknown	2006-09-28	4	-0/+21
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-5.0/mysql-5.0-bug-19651 ndb/test/ndbapi/flexScan.cpp: Auto merged ndb/tools/ndb_config.cpp: Auto merged ndb/tools/restore/consumer_restore.cpp: Auto merged ndb/tools/restore/consumer_restore.hpp: Auto merged ndb/tools/restore/restore_main.cpp: Auto merged ndb/include/util/ndb_opts.h: C
\| *	Merge dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-ndb-bj	unknown	2006-09-28	4	-0/+21
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into dev3-76.dev.cn.tlan:/home/dli/mysql/mysql-4.1/mysql-4.1-bug-19651
\| \| *	fix for bug#19651, if temporary error occured while retoring, report it in ↵	unknown	2006-09-26	4	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the restore result. ndb/tools/restore/consumer.hpp: added a function to judge whether there is temporary error. ndb/tools/restore/consumer_restore.cpp: record when temporary error occured in restore. ndb/tools/restore/consumer_restore.hpp: added a member to record temporary error in restore. ndb/tools/restore/restore_main.cpp: report temporary error in restore.
\| * \|	BUG#21585 The --help option shows a screen of command options for the ↵	unknown	2006-09-19	1	-1/+1
\| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ndbd,ndb_mgmd, ndb_mgm and other commands related to ndb. For all of these, the help screen contains "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete. ndb/include/util/ndb_opts.h: Change help info from Ndb.cfg to my.cnf in the header file. ndb/test/ndbapi/flexScan.cpp: Change help info from Ndb.cfg to my.cnf. ndb/tools/ndb_config.cpp: Change help info from Ndb.cfg to my.cnf
* \|	BUG#21585 The --help option shows a screen of command options for ndbd, ↵	unknown	2006-09-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ndb_mgmd, ndb_mgm and other commands related to ndb. For all of these, the help screen contains "Ndb.cfg" string. Now i change the "Ndb.cfg" to "my.cnf" because "Ndb.cfg" is obsolete. ndb/include/util/ndb_opts.h: Change help info from "Ndb.cfg" string to "my.cnf" string in the header file. ndb/test/ndbapi/flexScan.cpp: Change help info from including "Ndb.cfg" to "my.cnf". ndb/tools/ndb_config.cpp: Change help info from including "Ndb.cfg" to "my.cnf".
* \|	Bug #20820 auto inc table not handled correctly when restored from cluster ↵	unknown	2006-07-06	1	-11/+29
\| \| \| \| \| \| \| \|	backup
* \|	Bug #19852 Restoring backup made from cluster with full data memory fails	unknown	2006-06-27	3	-1/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- make sure to allocate just enough pages in the fragments by using the actual row count from the backup, to avoid over allocation of pages to fragments, and thus avoid the bug ndb/include/kernel/GlobalSignalNumbers.h: Bug #19852 Restoring backup made from cluster with full data memory fails - distribute fragment complete to all participants to update row count ndb/include/kernel/signaldata/BackupContinueB.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - time slica writing of fragment info to ctl file ndb/include/kernel/signaldata/BackupImpl.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - 32 -> 64 bit on bytes and records - new signal fragment complete to all participants ndb/include/kernel/signaldata/BackupSignalData.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - 32 -> 64 bit on bytes and records ndb/include/kernel/signaldata/DictTabInfo.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - add min and max rows to dict tab info ndb/include/kernel/signaldata/LqhFrag.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - added min and max rows to add frag req ndb/include/kernel/signaldata/TupFrag.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - added min and max rows to add frag req ndb/include/ndbapi/NdbDictionary.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - added get/set of min max rows ndb/src/common/debugger/signaldata/BackupImpl.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - 32 -> 64 bit on bytes and records ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - 32 -> 64 bit on bytes and records ndb/src/common/debugger/signaldata/DictTabInfo.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - added min and max rows to dict tab info ndb/src/common/debugger/signaldata/LqhFrag.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - added min and max rows to frag req ndb/src/kernel/blocks/backup/Backup.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - new section in backup with per fragment info in ctl file - 32 -> 64 bit on bytes and records ndb/src/kernel/blocks/backup/Backup.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - new section in backup with per fragment info in ctl file - 32 -> 64 bit on bytes and records ndb/src/kernel/blocks/backup/BackupFormat.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - new section in backup with per fragment info in ctl file - 32 -> 64 bit on bytes and records ndb/src/kernel/blocks/backup/BackupInit.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - new signal fragment complete to all participants ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - added max and min rows to dict table object ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - added max and min rows to dict table object ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - added min and max rows to frag req ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - added min and max rows to frag req ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - added min and max rows to frag req ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - added min and max rows to frag req - move memory allocation to fragment to after adding of attributes to get correct headsize - allocate pages to fragments according to min rows setting ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - grow page allocation starting from 2 irrespective of first page allocation ndb/src/mgmsrv/MgmtSrvr.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - 32 -> 64 bits on bytes and records ndb/src/mgmsrv/MgmtSrvr.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - 32 -> 64 bits on bytes and records ndb/src/ndbapi/NdbDictionary.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - min and max rows in dict ndb/src/ndbapi/NdbDictionaryImpl.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - min and max rows in dict ndb/src/ndbapi/NdbDictionaryImpl.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - min and max rows in dict ndb/tools/restore/Restore.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - add retrieval of fragment info ndb/tools/restore/Restore.hpp: Bug #19852 Restoring backup made from cluster with full data memory fails - add retrieval of fragment info ndb/tools/restore/consumer_restore.cpp: Bug #19852 Restoring backup made from cluster with full data memory fails - set min in restore to the actual row count (this is the actual bug fix) sql/ha_ndbcluster.cc: Bug #19852 Restoring backup made from cluster with full data memory fails - set min and max rows according to sql definition
* \|	Merge mysql.com:/space/pekka/ndb/version/my50	unknown	2006-05-25	1	-3/+6
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/space/pekka/ndb/version/my50-bug14509 ndb/src/ndbapi/DictCache.cpp: Auto merged ndb/src/ndbapi/DictCache.hpp: Auto merged sql/ha_ndbcluster.cc: Auto merged
\| * \|	ndb - bug#14509 [related] re-do auto-incr error handling	unknown	2006-05-17	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ndb/include/ndbapi/Ndb.hpp: make auto-incr methods return int 0/-1 ndb/src/ndbapi/Ndb.cpp: make auto-incr methods return int 0/-1 ndb/src/ndbapi/NdbDictionaryImpl.cpp: make auto-incr methods return int 0/-1 ndb/test/ndbapi/testDict.cpp: make auto-incr methods return int 0/-1 ndb/tools/restore/consumer_restore.cpp: make auto-incr methods return int 0/-1 sql/ha_ndbcluster.cc: make auto-incr methods return int 0/-1
\| * \|	ndb - bug#14509 [related] setAutoIncrement: add error handling	unknown	2006-05-16	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ndb/include/ndbapi/Ndb.hpp: setAutoIncrement: add error handling ndb/src/ndbapi/Ndb.cpp: setAutoIncrement: add error handling ndb/src/ndbapi/NdbDictionaryImpl.cpp: setAutoIncrement: add error handling ndb/tools/restore/consumer_restore.cpp: setAutoIncrement: add error handling sql/ha_ndbcluster.cc: setAutoIncrement: add error handling
* \| \|	Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1	unknown	2006-05-17	1	-0/+6
\|\ \ \ \| \|/ / \|/\| / \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0 ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/tools/waiter.cpp: Auto merged
\| *	ndb: added some missing error codes to mgmapi	unknown	2006-05-17	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ndb: ndb_waiter disconnect/reconnect on get status error ndb/src/mgmapi/mgmapi.cpp: ndb: added some missing error codes to mgmapi ndb/tools/waiter.cpp: ndb: ndb_waiter disconnect/reconnect on get status error
* \|	Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2006-05-03	1	-17/+14
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/space/pekka/ndb/version/my50 mysql-test/r/ndb_blob.result: Auto merged mysql-test/t/ndb_blob.test: Auto merged ndb/include/kernel/signaldata/TcKeyReq.hpp: Auto merged ndb/include/ndbapi/NdbBlob.hpp: Auto merged ndb/src/ndbapi/NdbBlob.cpp: Auto merged ndb/test/ndbapi/testBlobs.cpp: Auto merged sql/sql_table.cc: Auto merged ndb/tools/delete_all.cpp: nuts
\| *	ndb - bug#19201 (4.1), see comment in NdbBlob.cpp	unknown	2006-05-02	1	-17/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ndb/test/ndbapi/testBlobs.cpp: option -fac (fetch across commit) ndb/tools/delete_all.cpp: option --transactional (default remains truncate) mysql-test/r/ndb_blob.result: bug#19201 mysql-test/t/ndb_blob.test: bug#19201 ndb/include/kernel/signaldata/TcKeyReq.hpp: bug#19201 ndb/include/ndbapi/NdbBlob.hpp: bug#19201 ndb/src/ndbapi/NdbBlob.cpp: bug#19201
\| *	Makefile.am:	unknown	2006-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use "dist_bin_SCRIPTS" to get a script distributed ndb/tools/Makefile.am: Use "dist_bin_SCRIPTS" to get a script distributed
* \|	Makefile.am:	unknown	2006-03-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use "dist_bin_SCRIPTS" to get a script distributed ndb/tools/Makefile.am: Use "dist_bin_SCRIPTS" to get a script distributed
* \|	Merge	unknown	2006-03-29	1	-1/+2
\|\ \ \| \|/ \| \| \| \| \| \|	sql/field.cc: Auto merged
\| *	Makefile.am:	unknown	2006-03-29	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Install "ndb_size.pl" script and template, bug#18421 ndb/tools/Makefile.am: Install "ndb_size.pl" script and template, bug#18421
* \|	Makefile.am:	unknown	2006-03-29	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added "ndb_error_reporter" script, bug#18421 ndb/tools/Makefile.am: Added "ndb_error_reporter" script, bug#18421
* \|	ndb -	unknown	2006-03-22	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
* \|	Merge perch.ndb.mysql.com:/home/jonas/src/41-work	unknown	2006-03-22	1	-0/+78
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	ndb -	unknown	2006-03-22	1	-0/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add per partition info (optionally to ndb_desc) ndb/tools/desc.cpp: Add per partition info (optionally to ndb_desc)
* \|	ndb:	unknown	2006-02-13	2	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add optional reporting of of a "name" tied to a nodeid in the cluster log reporting added for mysql server and ndb_restore
* \|	Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2006-02-05	1	-5/+26
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \|	into mysql.com:/space/pekka/ndb/version/my50
\| *	ndb - bug#16693 (4.1) test + workaround, analyze later	unknown	2006-02-05	1	-5/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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)
* \|	Merge mysql.com:/opt/local/work/mysql-4.1-root	unknown	2006-01-19	1	-1/+1
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/opt/local/work/mysql-5.0-root mysql-test/ndb/ndbcluster.sh: Auto merged
\| *	small typo fixes	unknown	2006-01-19	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|	mysql-test/ndb/ndbcluster.sh: small fix to make ndb_mgmd run ndb/tools/ndb_size.pl: small typo
* \|	Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main	unknown	2005-12-28	1	-0/+88
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	New tool to collate all information to form a good error report for NDB.	unknown	2005-12-07	1	-0/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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''
* \|	Merge mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup	unknown	2005-12-06	1	-3/+3
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	ndb_size.pl:	unknown	2005-11-29	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix incorrect quoting of column name ndb/tools/ndb_size.pl: fix incorrect quoting of column name
* \|	Merge mysql.com:/home/jimw/my/mysql-4.1-clean	unknown	2005-11-17	2	-15/+118
\|\ \ \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	WL#2779 ndb_size.pl	unknown	2005-11-16	2	-1/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	WL#2779 ndb_size.pl	unknown	2005-11-16	2	-14/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| *	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1	unknown	2005-09-30	1	-59/+104
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
\| \| *	ndb_config	unknown	2005-09-30	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check returnvalue on load/fetch configuration ndb/tools/ndb_config.cpp: Check returnvalue on load/fetch configuration
* \| \|	postt review fixes	unknown	2005-10-12	1	-1/+3
\| \| \|
* \| \|	Bug #13009 No gaps allowed in node id number sequence	unknown	2005-10-12	1	-19/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ some small bugfixes in ndb_config + extending ndb_config to print connections and take shm option
* \| \|	Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-09-30	4	-59/+556
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/hartmut/projects/mysql/dev/5.0 ndb/tools/ndb_config.cpp: Auto merged
\| * \ \	Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-09-30	1	-58/+117
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.0	unknown	2005-09-30	1	-58/+117
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push include/my_sys.h: Auto merged mysys/default.c: Auto merged
\| \| \| * \| \|	ndb	unknown	2005-09-30	1	-3/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.1	unknown	2005-09-30	1	-61/+101
\| \| \| \|\ \ \ \| \| \| \| \| \|/ \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 -	unknown	2005-09-30	1	-61/+101
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \| \| \|	Merge mysql.com:/home/stewart/Documents/MySQL/4.1/main	unknown	2005-09-29	2	-0/+438
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| / \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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/wl2779	unknown	2005-09-29	2	-0/+438
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/stewart/Documents/MySQL/4.1/main
\| \| \| * \|	WL#2779 ndb_size.pl	unknown	2005-09-14	1	-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 NDB	unknown	2005-09-12	2	-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
\| * \| \| \|	ndb - bug#13512	unknown	2005-09-28	1	-1/+1
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	core dump on no free node id ndb/tools/restore/consumer_restore.cpp: return correct value
* \| \| \|	Merge hholzgraefe@bk-internal.mysql.com:/home/bk/mysql-5.0	unknown	2005-09-26	1	-3/+45
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into mysql.com:/home/hartmut/projects/mysql/dev/5.0