summaryrefslogtreecommitdiff
path: root/ndb
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/stewart/Documents/MySQL/5.0/mainunknown2005-12-281-0/+88
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.1/new client/mysqltest.c: Auto merged sql/item.cc: Auto merged sql/sql_trigger.cc: Auto merged storage/myisam/mi_create.c: Auto merged storage/myisam/mi_delete.c: Auto merged storage/ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged strings/decimal.c: Auto merged configure.in: remove 5.0 version increement sql/ha_archive.cc: merge sql/handler.cc: merge sql/mysqld.cc: merge
| * Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-274-2/+1293
| |\ | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my50
| * | 5.0 ndb build fix.unknown2005-12-281-1/+1
| | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: build fix for 5.0
| * | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mainunknown2005-12-282-1/+89
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | build fixunknown2005-12-211-1/+1
| | | |
| | * | Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mainunknown2005-12-195-27/+113
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
| | | * \ Merge mysql.com:/home/stewart/Documents/MySQL/4.1/mainunknown2005-12-195-27/+113
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/4.1/cleanup ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged
| | | | * | 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''
| | * | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-12-139-10/+241
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push ndb/src/ndbapi/NdbImpl.hpp: Auto merged ndb/src/ndbapi/NdbRecAttr.cpp: Auto merged ndb/src/ndbapi/ndb_cluster_connection.cpp: Auto merged
| | * \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-12-132-6/+10
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
| | * | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-235-19/+150
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-4.1-push
| | * | | | | | bug#13078 - ndbunknown2005-10-273-4/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memleak when doing ordered index scan on index with column larger than 32 bytes ndb/src/ndbapi/NdbImpl.hpp: Fix order of free lists so that destructors are run in correct order ndb/src/ndbapi/NdbRecAttr.cpp: Dont allocate theStorageX twice ndb/src/ndbapi/ndb_cluster_connection.cpp: Destroy mutexes
| * | | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/5.0/mainunknown2005-12-194-27/+25
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.0/cleanup ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged
| | * \ \ \ \ \ \ Merge mysql.com:/home/stewart/Documents/MySQL/4.1/cleanupunknown2005-12-064-27/+25
| | |\ \ \ \ \ \ \ | | | | |_|_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | | | Backup.cpp:unknown2005-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert comment to english ndb/src/kernel/blocks/backup/Backup.cpp: convert comment to english
| | | * | | | | | DblqhMain.cpp:unknown2005-11-301-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient. Makes it easier to grep for senders of signals to specific blocks ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Use DBblock_REF instead of calcBLOCKBlockRef(getOwnNodeId()) as they are the same and the former is more efficient.
| | | * | | | | | DbdihMain.cpp:unknown2005-11-291-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix small error that jonas pointed out that would mean we always die on assert, intsead of just on error ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: fix small error that jonas pointed out that would mean we always die on assert, intsead of just on error
| | | * | | | | | 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
| | | * | | | | | fix spuling mastaeke.unknown2005-11-291-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Goup is not needed to run cluster ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: s/ownNodeGoup/ownNodeGroup/
| | | * | | | | | DbdihMain.cpp:unknown2005-11-291-1/+2
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | management server performs this check on configuration. If we get this far with something incorrect, something is very wrong. ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: management server performs this check on configuration. If we get this far with something incorrect, something is very wrong.
* | | | | | | | ndb - post merge fixunknown2005-12-271-1286/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | storage/ndb/test/ndbapi/test_event_merge.cpp: Rename: ndb/test/ndbapi/test_event_merge.cpp -> storage/ndb/test/ndbapi/test_event_merge.cpp storage/ndb/test/ndbapi/Makefile.am: post-merge fix
* | | | | | | | Merge mysql.com:/space/pekka/ndb/version/my50unknown2005-12-271-0/+1286
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/space/pekka/ndb/version/my51 storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: merge-ul storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: merge-ul storage/ndb/test/ndbapi/Makefile.am: merge-ul
| * | | | | | | ndb - wl#2972 (5.0) fix detached trigger opType + new pgm test_event_mergeunknown2005-12-274-2/+1293
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/NdbEventOperationImpl.cpp: error code 4709 was set outside if() ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: fix opType for detached triggers (accidental miss since v21x?) ndb/test/ndbapi/Makefile.am: test_event_merge v5.0 ndb/test/ndbapi/test_event_merge.cpp: test_event_merge v5.0
| * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-12-144-4/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push mysql-test/r/ndb_basic.result: Auto merged mysql-test/t/ndb_basic.test: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged ndb/src/kernel/vm/SimulatedBlock.cpp: merge
| | * | | | | | bug#15682 - ndb - invalid handling of varchar in position/rnd_posunknown2005-12-144-4/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_basic.result: bug#15682 - invalid handling of varchar in position/rnd_pos mysql-test/t/ndb_basic.test: bug#15682 - invalid handling of varchar in position/rnd_pos ndb/src/kernel/blocks/dbtc/Dbtc.hpp: New error code for invalid key ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Handle invalid key gracefully ndb/src/kernel/vm/SimulatedBlock.cpp: Handle invalid key gracefully ndb/src/ndbapi/ndberror.c: New error code sql/ha_ndbcluster.cc: Fix varchar keys in position/rnd_pos
| * | | | | | | ndb - merge errorunknown2005-12-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | note bug#15629 has been fixed in release clone (sp on 64 bit platform), but not merged here yet ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: merge error
| * | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-12-139-8/+250
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-push ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged
| | * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-4.1unknown2005-12-139-8/+250
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.0 ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged ndb/test/ndbapi/testNodeRestart.cpp: Auto merged ndb/src/kernel/blocks/ERROR_codes.txt: merge ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: merge ndb/test/run-test/daily-basic-tests.txt: merge
| | | * | | | | ndb - bug#15685unknown2005-12-125-3/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error in abort handling in TC when timeout during abort ndb/src/kernel/blocks/ERROR_codes.txt: New error codes ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: New error codes ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Dont release transaction record to early ndb/test/ndbapi/testNodeRestart.cpp: Test case ndb/test/run-test/daily-basic-tests.txt: Test case
| | | * | | | | bug#15632 - ndbunknown2005-12-094-3/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes ndb/include/ndb_version.h.in: Handle upgrade of bug fix ndb/src/kernel/blocks/ERROR_codes.txt: New error code for delaying INCL_NODE_REQ ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Fix race between INCL_NODEREQ(prio b) and GCP_PREPARE(prio a) by also waiting for starting nodes ndb/test/ndbapi/testNodeRestart.cpp: Add testcase for bug#15632
| | | * | | | | bug#15587 - ndbunknown2005-12-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix typo in autotest script ndb/test/run-test/daily-basic-tests.txt: Fix typo in autotest script
| | | * | | | | bug#15587 - ndbunknown2005-12-087-4/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error in NF during NR ndb/include/kernel/signaldata/DumpStateOrd.hpp: Add dump for ERROR 5002 with specified table ndb/src/kernel/blocks/ERROR_codes.txt: Add dump for ERROR 5002 with specified table ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Run updateNodeInfo if failed node is not in list of storedReplicas ndb/src/kernel/blocks/dblqh/Dblqh.hpp: Add dump for ERROR 5002 with specified table ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Add dump for ERROR 5002 with specified table ndb/test/ndbapi/testNodeRestart.cpp: Add testcase for bug#15587 ndb/test/run-test/daily-basic-tests.txt: Add testcase for bug#15587
| * | | | | | | BUG#15512 crash during online add of API/SQL nodeunknown2005-12-061-7/+10
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Only get_connect_address for connected nodes. (also cleanup whitespace)
| * | | | | | Manually mergedunknown2005-12-021-5/+10
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/update.result: Auto merged mysql-test/t/update.test: Auto merged ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged sql/sql_update.cc: Auto merged
| | * | | | | BUG#15425 Small window for NF during backup failing without errorunknown2005-12-022-6/+10
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/backup/Backup.cpp: If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk, all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the error in FSAPPENDCONF is hit. This would mean that no error code was set for the backup and that it would be incomplete as not all IO had been written to disk before the node crash. This would not be reported to the user. So the backup would appear to succeed but it really didn't. The window for this is rather small though. ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)
| | * | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-194-16/+149
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck configure.in: Auto merged
| * | | | | | small build fix for some compilersunknown2005-11-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/common/mgmcommon/ConfigRetriever.cpp: build fix for some compilers
| * | | | | | Merge mysql.com:/home/stewart/Documents/MySQL/5.0/mainunknown2005-11-242-1/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/stewart/Documents/MySQL/5.0/bug15215
| | * | | | | | BUG#15215 mysqld fails at start-up because of illegal reply from mgmdunknown2005-11-242-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the rare circumstance where a mysqld connects to a mgm server, then the mgm server goes away before a node id can be allocated, it was possible to get an Error in mgm protocol parser error message. ndb/src/common/mgmcommon/ConfigRetriever.cpp: When allocating node id, retry connecting to a management server if it goes away. ndb/src/mgmapi/mgmapi.cpp: Treat Eof and NoLine results from the parser as a sign that we should disconnect from this management server. It's up to the caller to work out if they want to try again.
| * | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-191-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-5.0-distcheck configure.in: Auto merged
| | * \ \ \ \ \ \ Mergeunknown2005-11-041-1/+1
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefile.am: Auto merged client/Makefile.am: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged netware/Makefile.am: Auto merged support-files/Makefile.am: Auto merged
| | | * | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-041-3/+1
| | | |\ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck Makefile.am: Auto merged configure.in: Auto merged mysql-test/Makefile.am: Auto merged
| | | | * | | | | Makefile.am, configure.in:unknown2005-09-241-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable "make distcheck" to work configure.in: Enable "make distcheck" to work Docs/Makefile.am: Enable "make distcheck" to work Makefile.am: Enable "make distcheck" to work client/Makefile.am: Enable "make distcheck" to work cmd-line-utils/libedit/Makefile.am: Enable "make distcheck" to work include/Makefile.am: Enable "make distcheck" to work libmysql/Makefile.am: Enable "make distcheck" to work libmysql_r/Makefile.am: Enable "make distcheck" to work libmysqld/Makefile.am: Enable "make distcheck" to work libmysqld/examples/Makefile.am: Enable "make distcheck" to work mysql-test/Makefile.am: Enable "make distcheck" to work ndb/docs/Makefile.am: Enable "make distcheck" to work netware/Makefile.am: Enable "make distcheck" to work pstack/Makefile.am: Enable "make distcheck" to work scripts/Makefile.am: Enable "make distcheck" to work sql-bench/Makefile.am: Enable "make distcheck" to work sql/Makefile.am: Enable "make distcheck" to work sql/share/Makefile.am: Enable "make distcheck" to work support-files/Makefile.am: Enable "make distcheck" to work
| * | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-11-172-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
| | * | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-162-1/+31
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/export/space/pekka/ndb/version/my41-r1.2456.1.1
| | * | | | | | | 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
| * | | | | | | ndb - bug#14007 5.0 *** does not automerge into 5.1 ***unknown2005-11-163-58/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_charset.result: bug#14007 5.0 mysql-test/t/ndb_charset.test: bug#14007 5.0 ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: bug#14007 5.0 ndb/src/kernel/vm/SimulatedBlock.cpp: bug#14007 5.0 ndb/src/kernel/vm/SimulatedBlock.hpp: bug#14007 5.0
| * | | | | | | DbtupRoutines.cpp:unknown2005-11-161-1/+22
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto merged ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Auto merged
| | * | | | | | ndb - bug#14007 4.1 [re-commit for LenZ merge]unknown2005-11-162-1/+31
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_charset.result: bug#14007 test [re-commit] mysql-test/t/ndb_charset.test: bug#14007 test [re-commit] ndb/include/kernel/AttributeDescriptor.hpp: bug#14007 4.1 need getSizeInBytes [re-commit] ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: bug#14007 4.1 *** do not AUTOmerge to 5.0 *** [re-commit]
View Lorry Controller Status