summaryrefslogtreecommitdiff
path: root/ndb/tools
Commit message (Collapse)AuthorAgeFilesLines
* ndb: added some missing error codes to mgmapiunknown2006-05-171-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
* ndb - bug#19201 (4.1), see comment in NdbBlob.cppunknown2006-05-021-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:unknown2006-03-291-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:unknown2006-03-291-0/+3
| | | | | | | | Install "ndb_size.pl" script and template, bug#18421 ndb/tools/Makefile.am: Install "ndb_size.pl" script and template, bug#18421
* ndb -unknown2006-03-221-0/+77
| | | | | | | | Add per partition info (optionally to ndb_desc) ndb/tools/desc.cpp: Add per partition info (optionally to ndb_desc)
* ndb - bug#16693 (4.1) test + workaround, analyze laterunknown2006-02-051-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)
* small typo fixesunknown2006-01-191-1/+1
| | | | | | | mysql-test/ndb/ndbcluster.sh: small fix to make ndb_mgmd run ndb/tools/ndb_size.pl: small typo
* New tool to collate all information to form a good error report for NDB.unknown2005-12-071-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''
* ndb_size.pl:unknown2005-11-291-3/+3
| | | | | | | | fix incorrect quoting of column name ndb/tools/ndb_size.pl: fix incorrect quoting of column name
* WL#2779 ndb_size.plunknown2005-11-162-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.plunknown2005-11-162-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.1unknown2005-09-301-59/+104
|\ | | | | | | | | | | | | 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
| * ndb -unknown2005-09-301-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/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
* | ndbunknown2005-09-161-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | impl support for querying resource usage in ndb api to help track down mem leaks ndb/include/ndbapi/Ndb.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbBlob.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbConnection.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbIndexOperation.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbIndexScanOperation.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbOperation.hpp: Impl. reporting of free list usage Put free list into handler class ndb/include/ndbapi/NdbRecAttr.hpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbApiSignal.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbApiSignal.hpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbBlob.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbImpl.hpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbRecAttr.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbUtil.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/NdbUtil.hpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/Ndbif.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/Ndbinit.cpp: Impl. reporting of free list usage Put free list into handler class ndb/src/ndbapi/Ndblist.cpp: Impl. reporting of free list usage Put free list into handler class ndb/tools/restore/Restore.cpp: Impl. reporting of free list usage Put free list into handler class
* added --core-file option to ndb executablesunknown2005-09-054-31/+49
| | | | | | | added parseable printout in ndb_restore
* Makefile.am:unknown2005-08-112-1/+1
| | | | | | | | | | | | config.cpp => ndb_config.cpp, solves link problems on case insensitive OS ndb_config.cpp: Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp ndb/tools/ndb_config.cpp: Rename: ndb/tools/config.cpp -> ndb/tools/ndb_config.cpp ndb/tools/Makefile.am: config.cpp => ndb_config.cpp, solves link problems on case insensitive OS
* Portability fixes:unknown2005-08-031-1/+1
| | | | | | | | | | | | | | | | | | - Moved a few DBUG_ENTER statements after the variable declarations to satisfy some compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r) in ndb/src/common/portlib/NdbMutex.c and ndb/src/common/portlib/NdbThread.c - portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll() in ndb/tools/config.cpp ndb/src/common/portlib/NdbMutex.c: - Moved a few DBUG_ENTER statements after the variable declarations to satisfy some compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r) ndb/src/common/portlib/NdbThread.c: - Moved a DBUG_ENTER statement after the variable declarations to satisfy some compilers (e.g. gcc-2.95.x, gcc-2.96, IBM xlc_r) ndb/tools/config.cpp: - portability fix for FreeBSD 4.x and HPUX: replaced atoll() with strtoll()
* Merge mysql.com:/home/jonas/src/mysql-4.1unknown2005-07-251-2/+2
|\ | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-push
| * fix compile errorunknown2005-07-251-2/+2
| |
* | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2005-07-252-1/+419
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-push ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged ndb/src/mgmsrv/ConfigInfo.hpp: Auto merged
| * Add tool to extract config info from ndb_mgmdunknown2005-07-232-1/+419
| | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/mgmapi/mgmapi.h: Add feature to redirect error printouts ndb/src/mgmapi/mgmapi.cpp: Add feature to redirect error printouts ndb/src/mgmsrv/ConfigInfo.hpp: Make param info public ndb/tools/Makefile.am: Add ndb_config ndb/tools/config.cpp: New BitKeeper file ``ndb/tools/config.cpp''
* | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2005-07-202-4/+7
|\ \ | |/ | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1-push
| * bug#11942unknown2005-07-202-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/kernel/signaldata/AlterTable.hpp: Add error code for backup in progress ndb/include/kernel/signaldata/DictTabInfo.hpp: Add backup state ndb/include/kernel/signaldata/DropTable.hpp: Add error code for backup in progress ndb/include/ndbapi/NdbDictionary.hpp: Add backup state ndb/src/kernel/blocks/backup/Backup.cpp: 1) remove invalid require (util_sequence_ref) crash 2) Don't backup objects dropping/creating 3) set correct error code on backup fragment ref (crash) 4) save TrigAttrInfo header when getting log full (crash) 5) lock/unlock tables during backup ndb/src/kernel/blocks/dbdict/Dbdict.cpp: 1) add mutex lock/unlock as part of drop/alter table 2) add lock/unlock for backup 3) remove TC from backup trigger loop ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Add BACKUP_ONGOING state ndb/src/ndbapi/NdbDictionaryImpl.cpp: Add backup state ndb/src/ndbapi/ndberror.c: Add error code for backup in progress ndb/test/ndbapi/testBackup.cpp: Add testcase for testBackup -n BackupDDL ndb/tools/drop_index.cpp: Fix ndb_drop_index ndb/tools/listTables.cpp: Print of backup state
* | stilled mem leak in usage on getVersionStringunknown2005-07-141-1/+2
|/ | | | | | | | | | | | | | | | | | | added __LINE__ so systemErrorLab for better error printout ndb/include/ndb_version.h.in: stilled mem leak in usage on getVersionString ndb/include/util/version.h: stilled mem leak in usage on getVersionString ndb/src/common/util/version.c: stilled mem leak in usage on getVersionString ndb/src/kernel/blocks/qmgr/Qmgr.hpp: added __LINE__ so systemErrorLab for better error printout ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: stilled mem leak in usage on getVersionString added __LINE__ so systemErrorLab for better error printout ndb/tools/restore/restore_main.cpp: stilled mem leak in usage on getVersionString
* bug#10294 - ndb restore with #concurrent transactions < parallelismunknown2005-06-131-8/+16
| | | | | | | | Enable retry on startTransaction ndb/tools/restore/consumer_restore.cpp: Enable retry on startTransaction==NULL
* bug#11166 - ndbunknown2005-06-083-9/+36
| | | | | | | | | | | | | | | | | | | | Fix potential inconsistency when running ndb_restore due to faulty parsing of backup log wrt inserts ndb/src/kernel/blocks/backup/Backup.cpp: Make sure that entire stopGCP is in log ndb/tools/restore/Restore.cpp: Notice: this will not group and commit the deltas listed below into a ChangeSet, because there are no ChangeSet comments. Click [Checkin] again to check in only the commented deltas, or type Control-l to go back and provide ChangeSet comments. ndb/tools/restore/Restore.hpp: Keep track of last gci to next iteration ndb/tools/restore/consumer_restore.cpp: Handle insert in log Only allow certain errors
* ndb - csc#4847 release scan op early to save memoryunknown2005-04-051-1/+1
| | | | | | | | | | | | | | | ndb/include/ndbapi/NdbConnection.hpp: release scan op of hupped trans at scan close to save memory ndb/include/ndbapi/NdbScanOperation.hpp: release scan op of hupped trans at scan close to save memory ndb/src/ndbapi/NdbConnection.cpp: release scan op of hupped trans at scan close to save memory ndb/src/ndbapi/NdbResultSet.cpp: release scan op of hupped trans at scan close to save memory ndb/src/ndbapi/NdbScanOperation.cpp: release scan op of hupped trans at scan close to save memory ndb/tools/desc.cpp: release scan op of hupped trans at scan close to save memory
* ndb - fix old decimal type mysql vs ndbunknown2005-02-161-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_index_ordered.result: fix old decimal type mysql vs ndb (re-commit 3) mysql-test/t/ndb_index_ordered.test: fix old decimal type mysql vs ndb (re-commit 3) ndb/include/kernel/signaldata/DictTabInfo.hpp: fix old decimal type mysql vs ndb (re-commit 3) ndb/include/ndbapi/NdbDictionary.hpp: fix old decimal type mysql vs ndb (re-commit 3) ndb/include/util/NdbSqlUtil.hpp: fix old decimal type mysql vs ndb (re-commit 3) ndb/src/common/util/NdbSqlUtil.cpp: fix old decimal type mysql vs ndb (re-commit 3) ndb/src/ndbapi/NdbDictionary.cpp: fix old decimal type mysql vs ndb (re-commit 3) ndb/src/ndbapi/NdbDictionaryImpl.cpp: fix old decimal type mysql vs ndb (re-commit 3) ndb/src/ndbapi/NdbRecAttr.cpp: fix old decimal type mysql vs ndb (re-commit 3) ndb/test/include/NdbSchemaOp.hpp: fix old decimal type mysql vs ndb (re-commit 3) ndb/tools/restore/consumer.cpp: fix old decimal type mysql vs ndb (re-commit 3) sql/ha_ndbcluster.cc: fix old decimal type mysql vs ndb (re-commit 3)
* Bug#8167 signal usage clash between mysql server and ndb shared memoryunknown2005-01-289-179/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added shared memory config parameter, signum for use in signalling added global variable for holdign signum to be used for shared memory connection only fiddle with signals if it is set simplified common ndb client option handling ndb/include/Makefile.am: added common defaults file ndb/include/mgmapi/mgmapi_config_parameters.h: added shared memory config parameter, signum for use in signalling ndb/include/transporter/TransporterDefinitions.hpp: added shared memory config parameter, signum for use in signalling ndb/include/util/ndb_opts.h: simplified common ndb client option handling ndb/src/common/mgmcommon/IPCConfig.cpp: added shared memory config parameter, signum for use in signalling ndb/src/common/portlib/NdbThread.c: added global variable for holdign signum to be used for shared memory connection only block signals if shared memory is used ndb/src/common/transporter/SHM_Transporter.cpp: use signum in new global variable for shared memory signalling ndb/src/common/transporter/TransporterRegistry.cpp: use signum in new global variable for shared memory signalling only fiddle with signals if it is set ndb/src/cw/cpcd/main.cpp: ndb_opts not really used ndb/src/kernel/vm/Configuration.cpp: simplified common ndb client option handling ndb/src/mgmclient/main.cpp: simplified common ndb client option handling ndb/src/mgmsrv/ConfigInfo.cpp: added shared memory config parameter, signum for use in signalling ndb/src/mgmsrv/main.cpp: simplified common ndb client option handling ndb/tools/delete_all.cpp: simplified common ndb client option handling ndb/tools/desc.cpp: simplified common ndb client option handling ndb/tools/drop_index.cpp: simplified common ndb client option handling ndb/tools/drop_tab.cpp: simplified common ndb client option handling ndb/tools/listTables.cpp: simplified common ndb client option handling ndb/tools/restore/restore_main.cpp: simplified common ndb client option handling ndb/tools/select_all.cpp: simplified common ndb client option handling ndb/tools/select_count.cpp: simplified common ndb client option handling ndb/tools/waiter.cpp: simplified common ndb client option handling
* backported from 5.0 extra option to ndb_waiterunknown2005-01-231-6/+21
|
* Bug#7937unknown2005-01-171-14/+19
|
* ndb - wl-1442 fix Time orderingunknown2005-01-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_index_ordered.result: wl-1442 fix Time. adds new type id 25 mysql-test/t/ndb_index_ordered.test: wl-1442 fix Time. adds new type id 25 ndb/include/kernel/signaldata/DictTabInfo.hpp: wl-1442 fix Time. adds new type id 25 ndb/include/ndbapi/NdbDictionary.hpp: wl-1442 fix Time. adds new type id 25 ndb/include/util/NdbSqlUtil.hpp: wl-1442 fix Time. adds new type id 25 ndb/src/common/util/NdbSqlUtil.cpp: wl-1442 fix Time. adds new type id 25 ndb/src/ndbapi/NdbDictionary.cpp: wl-1442 fix Time. adds new type id 25 ndb/src/ndbapi/NdbDictionaryImpl.cpp: wl-1442 fix Time. adds new type id 25 ndb/test/include/NdbSchemaOp.hpp: wl-1442 fix Time. adds new type id 25 ndb/tools/restore/consumer.cpp: wl-1442 fix Time. adds new type id 25 sql/ha_ndbcluster.cc: wl-1442 fix Time. adds new type id 25
* ndb - wl-1442 fix Date orderingunknown2005-01-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_index_ordered.result: wl-1442 fix Date. reuses old unused Timespec type id mysql-test/t/ndb_index_ordered.test: wl-1442 fix Date. reuses old unused Timespec type id ndb/include/kernel/signaldata/DictTabInfo.hpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/include/ndbapi/NdbDictionary.hpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/include/util/NdbSqlUtil.hpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/src/common/util/NdbSqlUtil.cpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/src/ndbapi/NdbDictionary.cpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/src/ndbapi/NdbDictionaryImpl.cpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/test/include/NdbSchemaOp.hpp: wl-1442 fix Date. reuses old unused Timespec type id ndb/tools/restore/consumer.cpp: wl-1442 fix Date. reuses old unused Timespec type id sql/ha_ndbcluster.cc: wl-1442 fix Date. reuses old unused Timespec type id
* added config parameter Group on connectionunknown2004-12-209-10/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moved NdbWaiter, m_ndb_cluster_connection, to impl class moved node selection things to cluster connection moved all private things to impl class added opts for shared memory and node selection changed opts handling somewhat; introduced enum for options and common handling of option variables added checks for transporter support automatic addition of shared mem transporters moved wait_until_ready code to cluster connection added control of usage of new node selection method ndb/include/mgmapi/mgmapi_config_parameters.h: added config parameter Group on connection ndb/include/ndbapi/Ndb.hpp: moved NdbWaiter, m_ndb_cluster_connection, to impl class moved node selection things to cluster connection ndb/include/ndbapi/ndb_cluster_connection.hpp: moved all private things to impl class ndb/include/util/ndb_opts.h: added opts for shared memory and node selection ndb/src/kernel/vm/Configuration.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables ndb/src/mgmclient/main.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables ndb/src/mgmsrv/ConfigInfo.cpp: added checks for transporter support automatic addition of shared mem transporters ndb/src/mgmsrv/MgmtSrvr.cpp: in alloc node id first choose connection with specified hostname ndb/src/mgmsrv/main.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables ndb/src/ndbapi/DictCache.hpp: added include file ndb/src/ndbapi/Ndb.cpp: enabled using new node selection method moved wait_until_ready code to cluster connection moved node selection (hint) to cluster connection removed start transaction dgroup ndb/src/ndbapi/NdbDictionaryImpl.hpp: removed and added inclusde files ndb/src/ndbapi/NdbImpl.hpp: moved things from Ndb into Impl class moved waiter things to new file NdbWaiter.hpp ndb/src/ndbapi/NdbScanOperation.cpp: ndbwaiter is no in impl class ndb/src/ndbapi/Ndbif.cpp: ndbwaiter is no in impl class ndb/src/ndbapi/Ndbinit.cpp: moved some Ndb things into impl class ndb/src/ndbapi/TransporterFacade.hpp: changed friend declaration ndb/src/ndbapi/ndb_cluster_connection.cpp: moved node selection things to cluster connection moved things from cluster connection to cluster connection impl class ndb/test/ndbapi/testNdbApi.cpp: removed start transaction dgroup ndb/tools/delete_all.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables ndb/tools/desc.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables ndb/tools/drop_index.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables ndb/tools/drop_tab.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables ndb/tools/listTables.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables ndb/tools/restore/restore_main.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables ndb/tools/select_all.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables ndb/tools/select_count.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables ndb/tools/waiter.cpp: changed opts handling somewhat; introduced enum for options and common handling of option variables sql/ha_ndbcluster.cc: added control of usage of new node selection method sql/mysqld.cc: added control of usage of new node selection method
* mergeunknown2004-12-1711-59/+47
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BitKeeper/etc/logging_ok: auto-union configure.in: Auto merged ndb/include/Makefile.am: Auto merged ndb/include/kernel/LogLevel.hpp: Auto merged ndb/include/mgmapi/mgmapi.h: Auto merged ndb/include/ndbapi/NdbConnection.hpp: Auto merged ndb/include/ndbapi/NdbDictionary.hpp: Auto merged ndb/src/common/debugger/EventLogger.cpp: Auto merged ndb/src/common/logger/FileLogHandler.cpp: Auto merged ndb/src/common/logger/Logger.cpp: Auto merged ndb/src/common/mgmcommon/ConfigRetriever.cpp: Auto merged ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/main.cpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: Auto merged ndb/src/kernel/vm/Configuration.cpp: Auto merged ndb/src/mgmapi/mgmapi.cpp: Auto merged ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged ndb/src/mgmsrv/MgmtSrvr.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/src/mgmsrv/main.cpp: Auto merged ndb/src/ndbapi/NdbConnection.cpp: Auto merged ndb/src/ndbapi/TransporterFacade.cpp: Auto merged ndb/src/ndbapi/ndberror.c: Auto merged ndb/tools/Makefile.am: Auto merged
| * Making 4.1 tree compile with -ansi -pedanticunknown2004-12-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | include/raid.h: Fixing compile-time warning: pragma interface is not supported in C, let's move it to C++ part of the header. ndb/include/kernel/signaldata/CreateEvnt.hpp: - remove extra erroneous ; from ends of function definitions ndb/include/kernel/signaldata/PackedSignal.hpp: - remove extra erroneous ; from ends of function definitions ndb/include/kernel/signaldata/SumaImpl.hpp: - remove extra erroneous ; from ends of function definitions ndb/src/common/debugger/signaldata/DictTabInfo.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/common/debugger/signaldata/NFCompleteRep.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/common/logger/FileLogHandler.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/backup/BackupInit.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/dbacc/DbaccInit.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/dbdict/Dbdict.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/dbtux/Dbtux.hpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/dbutil/DbUtil.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/grep/GrepInit.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/ndbfs/VoidFs.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/suma/Suma.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/suma/SumaInit.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/kernel/blocks/trix/Trix.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/mgmsrv/MgmtSrvr.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/ndbapi/NdbEventOperation.cpp: - remove extra erroneous ; from ends of function definitions ndb/src/ndbapi/NdbScanFilter.cpp: - remove extra erroneous ; from ends of function definitions ndb/tools/restore/Restore.cpp: - remove extra erroneous ; from ends of function definitions sql/item_create.h: - remove extra erroneous ; sql/sql_cache.cc: - remove extra erroneous ; tests/client_test.c: - fix -pedantic warning
| * Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2004-12-093-8/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1 ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged ndb/src/kernel/blocks/backup/Backup.hpp: Auto merged ndb/src/kernel/blocks/backup/BackupInit.cpp: Auto merged ndb/tools/restore/restore_main.cpp: Auto merged
| * | fixed error in test resultunknown2004-11-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added extra calls to retrieve connectstring used reengineered connect somewhat to make retries etc explicit mysql-test/r/ndb_index_unique.result: fixed error in test result ndb/include/mgmapi/mgmapi.h: added extra calls to retrieve connectstring used ndb/include/mgmcommon/ConfigRetriever.hpp: added extra calls to retrieve connectstring used ndb/include/ndbapi/ndb_cluster_connection.hpp: added extra calls to retrieve connectstring used reengineered connect somewhat to make retries etc explicit ndb/src/common/mgmcommon/ConfigRetriever.cpp: added extra calls to retrieve connectstring used ndb/src/mgmapi/mgmapi.cpp: added extra calls to retrieve connectstring used ndb/src/mgmclient/CommandInterpreter.cpp: moved parse of quit to avoid connect before ndb/src/ndbapi/Ndbinit.cpp: reengineered connect somewhat to make retries etc explicit ndb/src/ndbapi/ndb_cluster_connection.cpp: added extra calls to retrieve connectstring used reengineered connect somewhat to make retries etc explicit ndb/tools/listTables.cpp: reengineered connect somewhat to make retries etc explicit sql/ha_ndbcluster.cc: added extra calls to retrieve connectstring used reengineered connect somewhat to make retries etc explicit
| * | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1unknown2004-11-229-9/+9
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin ndb/src/kernel/vm/Configuration.cpp: Auto merged ndb/src/mgmclient/main.cpp: Auto merged ndb/src/mgmsrv/main.cpp: Auto merged ndb/tools/restore/restore_main.cpp: Auto merged ndb/tools/select_all.cpp: Auto merged ndb/tools/waiter.cpp: Auto merged
| | * | aligned connect string option on all cluster executables, ↵unknown2004-11-229-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --ndb-connectstring is now supported by all enabled new section in my.cnf [mysql_cluster], which is read by all executables, where connect string can be put for all cluster executables
| * | | Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2004-11-211-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/wl2077 ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged
| * \ \ \ Merge tulin@bk-internal.mysql.com:/tmp/my4.1-ndbunknown2004-11-191-1/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-mysqladmin
| | * \ \ \ Merge joreland@bk-internal.mysql.com:/tmp/my4.1-ndbunknown2004-11-191-1/+6
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/wl2077
| | | * | | Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2004-11-181-1/+6
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/wl2077 ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged ndb/src/ndbapi/NdbConnection.cpp: Auto merged
| * | | \ \ \ Mergeunknown2004-11-182-3/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/Makefile.am: Auto merged client/mysqladmin.cc: Auto merged configure.in: Auto merged ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged ndb/src/mgmclient/ndb_mgmclient.hpp: Auto merged ndb/src/mgmclient/ndb_mgmclient.h: Auto merged ndb/tools/restore/restore_main.cpp: SCCS merged
| | * | | | | change file name to avoid conflictunknown2004-11-182-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corrected mistake in previous patch ndb/tools/Makefile.am: change file name to avoid conflict ndb/tools/restore/restore_main.cpp: corrected mistake in previous patch