summaryrefslogtreecommitdiff
path: root/ndb
Commit message (Collapse)AuthorAgeFilesLines
* manual mergeunknown2005-01-121-22/+20
|\ | | | | | | | | sql/mysqld.cc: Auto merged
| * ndb - fix 64-bit problem in autotestunknown2005-01-121-22/+20
| | | | | | | | | | ndb/test/src/CpcClient.cpp: Fix 64-bit problem
* | Merging conflicts resolvedunknown2005-01-114-36/+46
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VC++Files/libmysqld/libmysqld.dsp: Auto merged client/mysql.cc: Auto merged include/my_sys.h: Auto merged libmysqld/lib_sql.cc: Auto merged mysql-test/r/ctype_utf8.result: Auto merged ndb/src/kernel/blocks/backup/Backup.cpp: Auto merged ndb/src/kernel/blocks/suma/Suma.cpp: Auto merged ndb/src/mgmsrv/InitConfigFileParser.cpp: Auto merged sql/item_strfunc.cc: Auto merged sql/strfunc.cc: Auto merged VC++Files/sql/mysqld.dsp: Libraries changed mysys/default.c: get_defaults_files implementation added sql/sql_base.cc: merging sql/sql_show.cc: merging
| * bug fixed parsing with comments on same lineunknown2005-01-111-2/+10
| |
| * Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-111-5/+23
| |\ | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| * | Suma.cpp:unknown2005-01-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | same as prev fix, wrong read of 64 bit value ndb/src/kernel/blocks/suma/Suma.cpp: same as prev fix, wrong read of 64 bit value
| * | Backup.cpp:unknown2005-01-111-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | bug#7660 ndb/src/kernel/blocks/backup/Backup.cpp: bug#7660
| * | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-111-30/+27
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
| | * | can't use my_pread,my_pwrite since it uses mutexes on the filesunknown2005-01-111-30/+27
| | | |
* | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-01-111-5/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0 sql/net_serv.cc: Auto merged sql/sql_class.h: Auto merged
| * \ \ \ Merge mysql.com:/home/jonas/src/mysql-4.1unknown2005-01-111-5/+23
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0 mysql-test/r/ndb_index_ordered.result: Auto merged mysql-test/t/ndb_index_ordered.test: Auto merged ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Auto merged sql/net_serv.cc: Auto merged sql/sql_class.h: Auto merged
| | * | | bug#7798 - ndb - range scan with invalid table version could cause node failureunknown2005-01-111-5/+23
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mysql-test/r/ndb_index_ordered.result: Test scan with invalid table version mysql-test/t/ndb_index_ordered.test: Test scan with invalid table version ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: Set apiConnectstate= CS_ABORTING when receving a scan req with invalid table version
* | | | Fixes for two compile-time failures.unknown2005-01-111-1/+1
|/ / / | | | | | | | | | | | | | | | | | | ndb/src/common/transporter/TransporterRegistry.cpp: make it compile with -ansi -pedantic sql/sql_lex.cc: a fix for compile-time failure
* | | Merge mysql.com:/home/jonas/src/mysql-4.1unknown2005-01-112-22/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-5.0 BitKeeper/etc/gone: auto-union innobase/os/os0file.c: Auto merged sql-common/client.c: Auto merged sql/examples/ha_archive.cc: Auto merged sql/net_serv.cc: Auto merged
| * | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-01-111-0/+4
| |\ \ | | |/ | |/| | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | * bug#7765 - ndb startup on 64-bit, increase stack on 64-bitunknown2005-01-111-0/+4
| | | | | | | | | | | | | | | ndb/src/common/portlib/NdbThread.c: Use double stack for 64-bit
| * | Bug#7477unknown2005-01-111-22/+7
| |/
* | ndb -unknown2005-01-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix ndb_limit, handle cmpDate of length 3 Remove ucs2 test as it requires one to configure --with-extra-charsets mysql-test/r/ndb_charset.result: Remove ucs2 test as it requires one to configure --with-extra-charsets mysql-test/t/ndb_charset.test: Remove ucs2 test as it requires one to configure --with-extra-charsets ndb/src/common/util/NdbSqlUtil.cpp: Fix ndb_limit, handle cmpDate of length 3
* | ndb - wl-1442 merge fix 5.0 -> 5.0-ndbunknown2005-01-091-1/+1
| | | | | | | | | | ndb/include/util/NdbSqlUtil.hpp: wl-1442 merge fix 5.0 -> 5.0-ndb
* | Mergeunknown2005-01-099-29/+109
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/ndbapi/NdbDictionary.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged sql/ha_ndbcluster.cc: Auto merged ndb/include/ndb_constants.h: merge 5.0->5.0-ndb ndb/include/kernel/signaldata/DictTabInfo.hpp: merge 5.0->5.0-ndb ndb/include/ndbapi/NdbDictionary.hpp: merge 5.0->5.0-ndb ndb/include/util/NdbSqlUtil.hpp: merge 5.0->5.0-ndb ndb/src/common/util/NdbSqlUtil.cpp: merge 5.0->5.0-ndb
| * | ndb - wl-1442 4.1->5.0 merge fixesunknown2005-01-084-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/kernel/signaldata/DictTabInfo.hpp: wl-1442 4.1->5.0 merge fixes ndb/include/ndb_constants.h: wl-1442 4.1->5.0 merge fixes ndb/include/util/NdbSqlUtil.hpp: wl-1442 4.1->5.0 merge fixes ndb/src/common/util/NdbSqlUtil.cpp: wl-1442 4.1->5.0 merge fixes
| * | Mergeunknown2005-01-088-22/+116
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Auto merged mysql-test/r/ndb_index_ordered.result: Auto merged mysql-test/t/ndb_index_ordered.test: Auto merged ndb/src/ndbapi/NdbDictionary.cpp: Auto merged ndb/include/kernel/signaldata/DictTabInfo.hpp: merge ndb/include/ndbapi/NdbDictionary.hpp: merge ndb/include/util/NdbSqlUtil.hpp: merge ndb/src/common/util/NdbSqlUtil.cpp: merge ndb/src/ndbapi/NdbDictionaryImpl.cpp: merge sql/ha_ndbcluster.cc: merge
| | * ndb - wl-1442 fix Time orderingunknown2005-01-088-3/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-088-40/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * ndb - wl-1442 bug#7725 datetime orderingunknown2005-01-081-14/+10
| | | | | | | | | | | | | | | | | | | | | mysql-test/t/ndb_index_ordered.test: wl-1442 datetime ordering ndb/src/common/util/NdbSqlUtil.cpp: wl-1442 datetime ordering
* | | updated some mgmapi docsunknown2005-01-092-9/+21
| | |
* | | ndb_constants.h:unknown2005-01-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | wl-1442 comment for 4.1->5.0 ndb/include/ndb_constants.h: wl-1442 comment for 4.1->5.0
* | | Ndb.hpp: Fixed some typos and added note unknown2005-01-091-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | about parallelism (Guide section). ndb/include/ndbapi/Ndb.hpp: Fixed some typos and added note about parallelism (Guide section).
* | | Merge jstephens@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-093-105/+200
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb ndb/include/ndbapi/Ndb.hpp: Auto merged
| * \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-083-105/+200
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb ndb/include/ndbapi/Ndb.hpp: Auto merged
| | * | | fixed some mgmapi docsunknown2005-01-083-105/+200
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | added example to ndbapi docs ndb/include/mgmapi/mgmapi.h: fixed some mgmapi docs ndb/include/ndbapi/Ndb.hpp: added examples ndb/src/mgmapi/mgmapi.cpp: removed unused parameter
* | | | | More documentation fixes/edits to Ndb.hpp (NDB unknown2005-01-091-54/+59
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Programmers Guide section.) ndb/include/ndbapi/Ndb.hpp: More fixes/edits (finished NDB Programmers Guide section.)
* | | | Merge jstephens@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-081-89/+79
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into gigan.:C:/cygwin/home/bk/mysql-5.0-ndb
| * | | First round of edits to Ndb.hpp for Alcatel PDF.unknown2005-01-081-89/+79
| | | | | | | | | | | | | | | | | | | | ndb/include/ndbapi/Ndb.hpp: Edits for Alcatel PDF version (first set).
* | | | Merge bk-internal:/home/bk/mysql-5.0-ndbunknown2005-01-082-6/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/tulin/mysql-5.0-ndb
| * \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-082-6/+21
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| | * | | fixed some missing references in the ndbapi docs for events and dictionaryunknown2005-01-082-6/+21
| | | | |
* | | | | Merge bk-internal:/home/bk/mysql-5.0-ndbunknown2005-01-081-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into build.mysql.com:/users/tulin/mysql-5.0-ndb
| * | | | Testing a new @ref in Ndb.hpp.unknown2005-01-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | ndb/include/ndbapi/Ndb.hpp: Testing a ref.
* | | | | Merge bk-internal:/home/bk/mysql-5.0unknown2005-01-082-5/+16
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | into build.mysql.com:/users/tulin/mysql-5.0-ndb
| * | | mergeunknown2005-01-072-5/+16
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Auto merged ndb/src/common/transporter/TransporterRegistry.cpp: Auto merged sql/log.cc: Auto merged sql/mysqld.cc: Auto merged scripts/mysql_fix_privilege_tables.sql: manually merged
| | * | bug#7690 - ndb startup with shm, use sigaction to escape SA_RESETHANDunknown2005-01-072-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configure.in: Check for sigaction used in SHM_Transporter ndb/src/common/transporter/SHM_Transporter.cpp: remove unused variable ndb/src/common/transporter/TransporterRegistry.cpp: 1) remove unused variable 2) Use sigaction instead of signal to install signal handler This as signal uses SA_RESETHAND
| | * | Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2005-01-032-26/+37
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1 ndb/include/ndb_global.h.in: Auto merged
| | * \ \ Merge mysql.com:/home/jonas/src/mysql-4.1-fixunknown2005-01-031-18/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/jonas/src/mysql-4.1
| | * | | | Checking size to no of free + 1 was not correct whenunknown2004-12-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | entry was released before check. Thus empty it is when size == no of free This caused a memory leak which inserted a hard limit of max 64 unique indexes in the cluster.
* | | | | | ndb - wl-1442 minorunknown2005-01-082-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ndb/src/kernel/blocks/dbtc/DbtcMain.cpp: wl-1442 minor ndb/test/ndbapi/testOIBasic.cpp: wl-1442 minor sql/ha_ndbcluster.cc: wl-1442 minor
* | | | | | Some cleanup in Ndb.hpp (testing for PDF generation).unknown2005-01-081-12/+13
| |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | ndb/include/ndbapi/Ndb.hpp: Some editing/cleanup.
* | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-073-53/+63
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| * | | | | updated docs on eventunknown2005-01-073-53/+63
| | | | | |
* | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2005-01-077-36/+127
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/export/space/pekka/ndb/version/my50-dt ndb/include/ndbapi/NdbDictionary.hpp: Auto merged ndb/src/ndbapi/NdbDictionary.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.cpp: Auto merged ndb/src/ndbapi/NdbDictionaryImpl.hpp: Auto merged
View Lorry Controller Status