summaryrefslogtreecommitdiff
path: root/storage/ndb/include/kernel
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-11188-25198/+0
| | | | | | | | | | remove: * NDB from everywhere * IM from mtr-v1 * packaging/rpm-oel and packaging/rpm-uln * few unused spec files * plug.in file * .bzrignore
* Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-17182-0/+182
| | | | | to copyright header.
* Updated/added copyright headersMurthy Narkedimilli2014-01-06183-185/+188
|
* Correcting the permissions of the executable files.Murthy Narkedimilli2013-03-203-0/+0
|
* Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-19184-184/+184
|
* Backport fixes for some of the more noise compiler warnings in ndb.Davi Arnaut2010-07-241-4/+4
|
* Bug #33544 UDF_INIT member decimals initialized wrong with Magne Mahre2009-11-111-4/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STRING_RESULT argument There is a "magic" number for precision : NOT_FIXED_DEC. This means that the precision is not a fixed number. But this constant was re-defined in several files and was not available to the UDF developers. Moved the NOT_FIXED_DEC definition to the correct header and removed the redundant definitions. Backported to 5.6.0 (mysql-next-mr-runtime) client/sql_string.h: moved NOT_FIXED_DEC to the correct header include/mysql_com.h: moved NOT_FIXED_DEC to the correct header libmysql/libmysql.c: moved NOT_FIXED_DEC to the correct header sql/field.h: moved NOT_FIXED_DEC to the correct header sql/sql_string.h: moved NOT_FIXED_DEC to the correct header storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: moved NOT_FIXED_DEC to the correct header
| * Bug #33544: UDF_INIT member decimals initialized wrong with unknown2008-03-051-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | STRING_RESULT argument There is a "magic" number for precision : NOT_FIXED_DEC. This means that the precision is not a fixed number. But this constant was re-defined in several files and was not available to the UDF developers. Moved the NOT_FIXED_DEC definition to the correct header and removed the redundant definitions. client/sql_string.cc: Bug #33544: moved NOT_FIXED_DEC to the correct header client/sql_string.h: Bug #33544: moved NOT_FIXED_DEC to the correct header include/mysql_com.h: Bug #33544: moved NOT_FIXED_DEC to the correct header libmysql/libmysql.c: Bug #33544: moved NOT_FIXED_DEC to the correct header sql/field.h: Bug #33544: moved NOT_FIXED_DEC to the correct header sql/sql_string.cc: Bug #33544: moved NOT_FIXED_DEC to the correct header sql/sql_string.h: Bug #33544: moved NOT_FIXED_DEC to the correct header storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: Bug #33544: moved NOT_FIXED_DEC to the correct header
* | Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndbunknown2008-01-102-1/+13
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bj 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/lgman.cpp: Auto merged storage/ndb/src/kernel/blocks/tsman.cpp: Auto merged storage/ndb/test/ndbapi/testDict.cpp: Auto merged storage/ndb/src/kernel/blocks/ERROR_codes.txt: SCCS merged storage/ndb/src/ndbapi/ndberror.c: SCCS merged
| * Merge gni@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bjunknown2008-01-101-0/+11
| |\ | | | | | | | | | | | | | | | | | | into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298
| | * Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug28298unknown2008-01-101-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug28298 storage/ndb/include/kernel/ndb_limits.h: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged
| * | BUG#29186 Return error to client in the following condition:unknown2007-11-121-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1: Create a log file which is larger than 4G in 32-bit host. 2: Create a data file (tablespace) which is larger than 4G in 32-bit host. storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp: Add error code for log file too large storage/ndb/src/kernel/blocks/ERROR_codes.txt: Add error insert code in lgman and tsman storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Add error code definination of lgman and tsman storage/ndb/src/kernel/blocks/lgman.cpp: Return REF when log file more than 4G in 32-bits host storage/ndb/src/kernel/blocks/tsman.cpp: return FER when data file larger than 4G in 32-bits host storage/ndb/src/ndbapi/ndberror.c: Add describe of new errorCode storage/ndb/test/ndbapi/testDict.cpp: Add test case for bug29186
* | Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndbunknown2007-12-072-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb storage/ndb/include/kernel/signaldata/TcKeyRef.hpp: Auto merged storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp: Auto merged storage/ndb/include/ndbapi/NdbDictionary.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionary.cpp: Auto merged storage/ndb/src/ndbapi/NdbTransaction.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged sql/ha_ndbcluster.cc: Merge storage/ndb/src/ndbapi/NdbOperationExec.cpp: Merge
* | Merge loke.(none):/home/knielsen/devel/mysql-5.1-telco-gcaunknown2007-10-251-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into loke.(none):/home/knielsen/devel/mysql-5.1-new-ndb storage/ndb/include/kernel/AttributeHeader.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationDefine.cpp: SCCS merged
| * | Merge loke.(none):/home/knielsen/devel/bug31761unknown2007-10-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into loke.(none):/home/knielsen/devel/mysql-5.1-telco-gca storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp: Auto merged storage/ndb/include/kernel/AttributeHeader.hpp: manual merge. storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: manual merge. storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: manual merge. storage/ndb/src/ndbapi/NdbOperationDefine.cpp: manual merge.
* | | ndb - bug#26450unknown2007-10-233-4/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | partial backport from 6.2 + add fix of bug storage/ndb/include/kernel/GlobalSignalNumbers.h: add prep_copy_frag storage/ndb/include/kernel/signaldata/AccScan.hpp: add new argument specifying which page to scan to storage/ndb/include/kernel/signaldata/CopyFrag.hpp: add new argument specifying which page to scan to storage/ndb/include/ndb_version.h.in: add versioning checks for prep_copy_frag storage/ndb/src/common/debugger/signaldata/SignalNames.cpp: add prep_copy_frag storage/ndb/src/kernel/blocks/ERROR_codes.txt: new error codes storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: add new to-step storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: add new to-step storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: add new to-step storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: add new to-step storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp: add new to-step storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: add new to-step storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: add new argument specifying which page to scan to storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: add utility to get max page used by fragment storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp: add NR scan to > frag.noOfPages storage/ndb/test/ndbapi/testSystemRestart.cpp: add testcase storage/ndb/test/run-test/daily-basic-tests.txt: add testcase storage/ndb/test/src/NdbRestarts.cpp: add testcase
* | | ndb - bug#31482unknown2007-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (re)impl. simple-read (read that releases lock just before LQHKEYCONF) use simple-read for blobs storage/ndb/include/kernel/signaldata/TcKeyConf.hpp: rename bit storage/ndb/include/ndbapi/NdbOperation.hpp: add new lock-mode storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp: rename bit storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp: remove aggregate storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: impl. simple-read = normal read + release lock just before LQHKEYCONF storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: impl. simple-read = normal read + release lock just before LQHKEYCONF storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: impl. simple-read = normal read + release lock just before LQHKEYCONF storage/ndb/src/ndbapi/NdbBlob.cpp: use simple read for blobs storage/ndb/src/ndbapi/NdbIndexOperation.cpp: no simple-read for ui (yet) storage/ndb/src/ndbapi/NdbOperationDefine.cpp: impl. simple-read storage/ndb/src/ndbapi/NdbOperationExec.cpp: impl. simple-read storage/ndb/src/ndbapi/NdbReceiver.cpp: impl. simple-read storage/ndb/src/ndbapi/NdbScanOperation.cpp: no simple-read for scan (yet) storage/ndb/src/ndbapi/NdbTransaction.cpp: rename bit storage/ndb/test/ndbapi/testBasic.cpp: add testcase for simlpe-read storage/ndb/test/run-test/daily-basic-tests.txt: add testcase storage/ndb/test/src/HugoOperations.cpp: add simple-read
* | | Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-ndbunknown2007-10-041-0/+1
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug29390 sql/ha_ndbcluster_cond.cc: Auto merged mysql-test/suite/ndb/r/ndb_condition_pushdown.result: Auto merged mysql-test/suite/ndb/t/ndb_condition_pushdown.test: Auto merged storage/ndb/include/kernel/signaldata/ScanTab.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanFilter.hpp: Auto merged storage/ndb/include/ndbapi/ndbapi_limits.h: Auto merged storage/ndb/src/ndbapi/NdbScanFilter.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: ul, add code (4294) in post-merge storage/ndb/include/ndbapi/Ndb.hpp: SCCS merged
* | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcaunknown2007-05-141-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb 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/DbtupMeta.cpp: Auto merged
| * ndb - bug#28348unknown2007-05-141-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | remove LCP files when dropping table storage/ndb/include/kernel/signaldata/FsOpenReq.hpp: add tup as user (for fsremove) storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: add remove LCP stuff storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: add remove LCP stuff storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp: remove each LCP file regardless if present or not
* | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcaunknown2007-04-301-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: Auto merged
| * ndb - bug#28161unknown2007-04-301-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix commit triggers with DD but not using DD storage/ndb/include/kernel/signaldata/TupCommit.hpp: add diskpage storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: add diskpage storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: pass disk/nodisk down detachedtrigger-path storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: use TUPCOMMIT req for signaling diskpage back and forth so that I can init pointers (VM_TRACE) when from LQH storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: remove niclude storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: only derefence disk pointer if needed
* | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gcaunknown2007-04-263-2/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: Auto merged storage/ndb/include/ndbapi/NdbDictionary.hpp: Auto merged storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged 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/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionary.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged storage/ndb/test/include/HugoOperations.hpp: Auto merged storage/ndb/test/ndbapi/testBasic.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/test/src/HugoOperations.cpp: Auto merged mysql-test/r/ndb_partition_key.result: manual merge sql/ha_ndbcluster.cc: manual merge storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: manual merge storage/ndb/test/src/NDBT_Table.cpp: manual merge
| * ndb: force varpart part I, allow setting of flag in dictionaryunknown2007-04-263-2/+6
| |
* | Merge bk-internal:/home/bk/mysql-5.1-new-ndbunknown2007-04-251-21/+33
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb storage/ndb/include/ndbapi/NdbOperation.hpp: Auto merged storage/ndb/include/ndbapi/NdbScanOperation.hpp: Auto merged storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged
| * | After-merge fixes.unknown2007-04-251-1/+1
| | |
| * | Merge ymer.(none):/usr/local/mysql/mysql-5.0-ndb-bug27370unknown2007-04-241-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ymer.(none):/usr/local/mysql/mysql-5.1-new-ndb storage/ndb/src/ndbapi/NdbBlob.cpp: Auto merged storage/ndb/src/ndbapi/NdbOperationDefine.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanOperation.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/include/kernel/signaldata/ScanTab.hpp: Manual merge. storage/ndb/include/ndbapi/NdbOperation.hpp: Manual merge. storage/ndb/include/ndbapi/NdbScanOperation.hpp: Manual merge. storage/ndb/test/ndbapi/testBlobs.cpp: Manual merge.
* | | Bug #27712 Single user mode. Creating logfile group and tablespace is allowedunknown2007-04-162-4/+8
| | |
* | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcaunknown2007-04-121-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Auto merged storage/ndb/test/include/HugoOperations.hpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/test/src/HugoOperations.cpp: Auto merged storage/ndb/test/src/HugoTransactions.cpp: Auto merged storage/ndb/include/kernel/AttributeHeader.hpp: merge storage/ndb/include/ndbapi/NdbDictionary.hpp: merge storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: merge storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: merge storage/ndb/test/ndbapi/testBasic.cpp: merge
| * | ndb - bug#27756unknown2007-04-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testcase only new pseudo column NDB$COPY_ROWID storage/ndb/include/kernel/AttributeHeader.hpp: Add new pseudo column for reading location of copy tuple storage/ndb/include/ndbapi/NdbDictionary.hpp: Add new pseudo column for reading location of copy tuple storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: Add new pseudo column for reading location of copy tuple storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Add new pseudo column for reading location of copy tuple storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: Add new pseudo column for reading location of copy tuple storage/ndb/test/ndbapi/testBasic.cpp: add testcase for bug#27756
* | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcaunknown2007-04-101-1/+2
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/include/kernel/signaldata/SumaImpl.hpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged
| * | ndb - bug#27728 (5.1)unknown2007-04-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure API is connected to nodes when subscribing storage/ndb/include/kernel/signaldata/SumaImpl.hpp: new error code storage/ndb/src/kernel/blocks/suma/Suma.cpp: make sure API is connected in SUB_START_REQ storage/ndb/src/ndbapi/ndberror.c: new error code
* | | ndb: change attribute id for ANY_VALUE as id was already reserved for ↵unknown2007-04-051-1/+2
| | | | | | | | | | | | upcoming read pached patch
* | | Merge dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndbunknown2007-04-051-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-240.dev.cn.tlan:/home/justin.he/mysql/mysql-5.1/mysql-5.1-new-ndb-bj.merge sql/handler.cc: Auto merged sql/sql_table.cc: Auto merged sql/sql_update.cc: Auto merged storage/ndb/src/mgmclient/CommandInterpreter.cpp: Auto merged storage/ndb/src/mgmsrv/ConfigInfo.cpp: Auto merged storage/ndb/src/ndbapi/NdbScanFilter.cpp: Auto merged sql/ha_ndbcluster.cc: merge
| * | | BUG#21699 DROP last DATAFILE from TABLESPACE even though there are still ↵unknown2007-03-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | table in it. And it gives the cofusing error message. mysql-test/r/ndb_dd_basic.result: adding some test result for increasing test codes. mysql-test/t/ndb_dd_basic.test: adding some test codes for nodatafile in tablespace. storage/ndb/include/kernel/signaldata/Extent.hpp: Add NoDatafile error code when allocating extent. storage/ndb/src/kernel/blocks/tsman.cpp: when there is no datafile in spacefile , it should return NoDatafile error code, rather than NoExtentAvailable. storage/ndb/src/ndbapi/ndberror.c: add no datafile error code and corresponding error message for NoDatafile
* | | | Bug #17095 Cluster RBR in circle does not terminateunknown2007-04-033-3/+22
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add any value to ndb - use it to update correct server id in binlog thread sql/ha_ndbcluster.cc: ndb: use "any value" to set correct server_id sql/ha_ndbcluster_binlog.cc: ndb: use "any value" to set correct server_id storage/ndb/include/kernel/AttributeHeader.hpp: add any_value as psudo column, updatable from ndbapi storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp: add any_value as psudo column, updatable from ndbapi storage/ndb/include/kernel/signaldata/SumaImpl.hpp: add any_value as psudo column, updatable from ndbapi storage/ndb/include/ndbapi/NdbDictionary.hpp: add any_value as psudo column, updatable from ndbapi storage/ndb/include/ndbapi/NdbEventOperation.hpp: add any_value as psudo column, updatable from ndbapi storage/ndb/include/ndbapi/NdbOperation.hpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/kernel/blocks/suma/Suma.cpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/ndbapi/NdbEventOperation.cpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/ndbapi/NdbOperationDefine.cpp: add any_value as psudo column, updatable from ndbapi storage/ndb/src/ndbapi/ndb_cluster_connection.cpp: add any_value as psudo column, updatable from ndbapi
* | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcaunknown2007-03-271-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/ERROR_codes.txt: Auto merged storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged storage/ndb/test/run-test/daily-basic-tests.txt: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: merge
| * | ndb - bug#27466 nf during nr can leave cluster in inconsistent state ↵unknown2007-03-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (recommit in 5.1) Fix race condition between NODE_FAILREP and local INCL_NODEREQ loop Also retry on ZNODE_START_DISALLOWED_ERROR storage/ndb/include/kernel/signaldata/StartPerm.hpp: Move error code storage/ndb/src/kernel/blocks/ERROR_codes.txt: new error code storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Move error code storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: 1) retry also on ZNODE_START_DISALLOWED_ERROR 2) Change if() else in INCL_NODECONF to for-loop instead 3) (last but not least) fix bug, that could cause different block withing same node to have different opinion about node status solution is to check if node is still alive before sening next local INCL_NODEREQ storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Add error insert to allow node to die during INCL_NODEREQ storage/ndb/src/kernel/blocks/suma/Suma.cpp: 1) let suma be well behaved (i.e reply to INCL_NODEREQ) 2) Add dump to print c_connceted_nodes/c_subscriber_nodes (8010) storage/ndb/test/ndbapi/testNodeRestart.cpp: new testcase storage/ndb/test/run-test/daily-basic-tests.txt: new testcase
* | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-single-userunknown2007-03-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged mysql-test/r/ndb_single_user.result: manual merge mysql-test/t/disabled.def: manual merge storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: manual merge storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: manual merge
* | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-userunknown2007-03-231-0/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged
| * | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gca-single-userunknown2007-03-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca-single-user storage/ndb/include/ndbapi/NdbDictionary.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionary.cpp: Auto merged storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged storage/ndb/include/kernel/signaldata/DictTabInfo.hpp: manual merge storage/ndb/include/ndb_constants.h: manual merge storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp: manual merge storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: manual merge storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp: manual merge storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp: manual merge storage/ndb/test/src/NDBT_Table.cpp: manual merge
* | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcaunknown2007-03-131-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/ERROR_codes.txt: Auto merged storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/restore.cpp: Auto merged storage/ndb/test/ndbapi/testNodeRestart.cpp: merge storage/ndb/test/run-test/daily-basic-tests.txt: merge
| * | ndb - bug#27003unknown2007-03-131-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | merge to 5.1, adopt testprg to optimized node recovery storage/ndb/include/kernel/signaldata/LqhKey.hpp: Add Restore as friend storage/ndb/src/kernel/blocks/restore.cpp: Give proper error message on LQHKEYREF storage/ndb/test/ndbapi/testNodeRestart.cpp: post merge fix, adopt to optimized node recovery...
* | Merge poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gcaunknown2007-03-025-3/+8
|\ \ | |/ | | | | | | | | | | | | | | | | into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/src/ndbapi/ndberror.c: Auto merged
| * Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gcaunknown2007-03-025-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca storage/ndb/include/kernel/signaldata/AlterTable.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropIndx.hpp: Auto merged storage/ndb/include/kernel/signaldata/DropTable.hpp: Auto merged storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Auto merged storage/ndb/include/kernel/signaldata/CreateIndx.hpp: manual merge storage/ndb/include/kernel/signaldata/CreateTable.hpp: manual merge storage/ndb/src/ndbapi/ndberror.c: manual merge
| * Merge poseidon.mysql.com:/home/tomas/mysql-5.0-telco-gcaunknown2007-02-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.mysql.com:/home/tomas/mysql-5.1-telco-gca sql/ha_ndbcluster.cc: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.hpp: Auto merged storage/ndb/src/ndbapi/SignalSender.hpp: Auto merged storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp: manual merge storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: manual merge storage/ndb/src/ndbapi/SignalSender.cpp: manual merge
* | Bug #26490 duplicate cluster error codeunknown2007-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fixed error code - added test program run in mysql-test-run bk version mysql-test/ndb/ndbcluster.sh: Bug #26490 duplicate cluster error code - added check for duplicate error in mysql-test run storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp: Bug #26490 duplicate cluster error code - fixed error code storage/ndb/src/ndbapi/Makefile.am: Bug #26490 duplicate cluster error code - added test program for duplicate error messages storage/ndb/src/ndbapi/ndberror.c: Bug #26490 duplicate cluster error code - fixed error code storage/ndb/src/ndbapi/ndberror_check.c: New BitKeeper file ``storage/ndb/src/ndbapi/ndberror_check.c''
* | Merge willster.(none):/home/stewart/Documents/MySQL/5.1/ndbunknown2007-02-141-5/+5
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-merge storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: SCCS merged
| * | Merge willster.(none):/home/stewart/Documents/MySQL/5.0/ndb-workunknown2007-02-141-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into willster.(none):/home/stewart/Documents/MySQL/5.1/ndb-work storage/ndb/include/kernel/GlobalSignalNumbers.h: Auto merged storage/ndb/src/common/debugger/signaldata/SignalNames.cpp: Auto merged storage/ndb/src/common/util/OutputStream.cpp: Auto merged storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbdih/DbdihMain.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/dbtc/Dbtc.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp: Auto merged storage/ndb/src/kernel/blocks/dbtc/DbtcMain.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/ndbcntr/Ndbcntr.hpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp: Auto merged storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Auto merged storage/ndb/src/mgmapi/mgmapi.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.hpp: Auto merged storage/ndb/src/mgmsrv/Services.cpp: Auto merged storage/ndb/src/mgmsrv/Services.hpp: Auto merged storage/ndb/include/mgmapi/mgmapi.h: merge storage/ndb/include/util/OutputStream.hpp: merge storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: merge storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp: merge
* | | Merge poseidon.mysql.com:/home/tomas/mysql-5.0-ndbunknown2007-02-141-1/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.mysql.com:/home/tomas/mysql-5.1-new-ndb storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Auto merged storage/ndb/src/kernel/vm/WatchDog.cpp: Auto merged storage/ndb/src/mgmsrv/MgmtSrvr.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.cpp: Auto merged storage/ndb/src/ndbapi/ClusterMgr.hpp: Auto merged storage/ndb/src/ndbapi/SignalSender.hpp: Auto merged storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp: manual merge storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp: manual merge storage/ndb/src/ndbapi/SignalSender.cpp: manual merge