summaryrefslogtreecommitdiff
path: root/storage/ndb/include
Commit message (Collapse)AuthorAgeFilesLines
* MDEV-34 delete storage/ndb and sql/*ndb* (and collateral changes)Sergei Golubchik2014-10-11280-45983/+0
| | | | | | | | | | remove: * NDB from everywhere * IM from mtr-v1 * packaging/rpm-oel and packaging/rpm-uln * few unused spec files * plug.in file * .bzrignore
* mysql-5.5.37 selective mergeSergei Golubchik2014-03-27271-0/+271
|\
| * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-17271-0/+271
| | | | | | | | | | to copyright header.
* | MySQL-5.5.36 mergeSergei Golubchik2014-02-17269-271/+274
|\ \ | |/ | | | | (without few incorrect bugfixes and with 1250 files where only a copyright year was changed)
| * Updated/added copyright headersMurthy Narkedimilli2014-01-06269-271/+274
| |
* | mysql-5.5.32 mergeSergei Golubchik2013-07-16270-270/+270
|\ \ | |/
| * 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-19270-270/+270
| |
* | merge with 5.3Sergei Golubchik2011-10-192-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sql/sql_insert.cc: CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. ****** CREATE ... IF NOT EXISTS may do nothing, but it is still not a failure. don't forget to my_ok it. sql/sql_table.cc: small cleanup ****** small cleanup
| * | Fix compilation errors (and some warnings) when compiling ndbMichael Widenius2011-01-293-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes part of LP:705213 (Other part is to be pushed into 5.1) storage/ndb/include/kernel/signaldata/FsOpenReq.hpp: Fixes compiler warnings storage/ndb/include/ndbapi/NdbDictionary.hpp: Update to right typedef storage/ndb/include/util/NdbSqlUtil.hpp: Remove not needed, conflicting code. storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: Added cast to get rid of not critical const.
| * | Fixed typosMichael Widenius2011-01-072-2/+2
| | | | | | | | | | | | Patch provided by Dolf Schimmel
| * | Fixed compiler and gmake warningsMichael Widenius2010-11-291-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Removed SCCS rule from Makefile.am - Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label. Don't use maintainer mode with valgrind (as we don't want to initialize all variables) config/ac-macros/maintainer.m4: Don't use maintainer mode with valgrind (as we don't want to initialize all variables) Force initialization of variables when using -Werror (To get rid of compiler warnings) configure.in: Don't use maintainer mode with valgrind (as we don't want to initialize all variables) sql/sql_yacc.yy: Made dummy rule in sql_yacc.yy to get rid of compiler warning about not used label.
| * | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-329/+356
| |\ \
| * | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-312-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Added braces around expressions with &&, ||, & and | - Added empty line before ; for empty while and for loops - Added () around if with assignments - Removed const before function returning simple type Changed BUILD scripts to not build with NDB BUILD/SETUP.sh: By default, don't build ndb with --max in Maria tree. NDB is not kept up to date anyway in 5.1 client/mysql.cc: Added braces around && to get rid of compiler warnings sql/event_db_repository.cc: Added braces around && to get rid of compiler warnings sql/events.cc: Added braces around && to get rid of compiler warnings sql/field.cc: Added braces around && to get rid of compiler warnings Fixed for loops sql/field.h: Added braces around & to get rid of compiler warnings sql/field_conv.cc: Added braces around && to get rid of compiler warnings Fixed bug when copying between DATETIME fields and strict dates are used Removed not needeed else sql/gstream.cc: Added braces around && to get rid of compiler warnings sql/ha_ndbcluster.cc: Added braces around && to get rid of compiler warnings Added {} to get rid of compiler warnings sql/handler.cc: Added braces around && to get rid of compiler warnings sql/item.cc: Added braces around && to get rid of compiler warnings sql/item_cmpfunc.cc: Added braces around && to get rid of compiler warnings Removed some not needed space sql/item_func.cc: Added braces around && to get rid of compiler warnings sql/item_strfunc.cc: Added braces around && to get rid of compiler warnings sql/item_subselect.cc: Added braces around && to get rid of compiler warnings sql/item_sum.cc: Added braces around && to get rid of compiler warnings sql/item_timefunc.cc: Added braces around && to get rid of compiler warnings sql/item_xmlfunc.cc: Added empty line before ; for empty while and for loops sql/log.cc: Added braces around && to get rid of compiler warnings sql/log_event.cc: Added braces around && to get rid of compiler warnings Removed not needed else sql/log_event_old.cc: Added braces around && to get rid of compiler warnings sql/opt_range.cc: Added braces around && to get rid of compiler warnings sql/opt_sum.cc: Added braces around && to get rid of compiler warnings sql/set_var.cc: Added empty line before ; for empty while and for loops Added () around if with assignments sql/slave.cc: Added braces around && to get rid of compiler warnings Added empty line before ; for empty while and for loops sql/spatial.h: Added braces around && to get rid of compiler warnings sql/sql_acl.cc: Added braces around && to get rid of compiler warnings sql/sql_analyse.cc: Added empty line before ; for empty while and for loops sql/sql_base.cc: Added braces around && to get rid of compiler warnings sql/sql_connect.cc: Added braces around && to get rid of compiler warnings sql/sql_db.cc: Added braces around && to get rid of compiler warnings sql/sql_delete.cc: Added braces around && to get rid of compiler warnings sql/sql_help.cc: Added empty line before ; for empty while and for loops sql/sql_insert.cc: Added braces around && to get rid of compiler warnings Added () around if with assignments sql/sql_lex.cc: Cast char array references to uchar; Fixed wrong array referencing when using characters > ASCII 128 in SQL statments Added empty line before ; for empty while and for loops Trivial indent fixes Added braces around && to get rid of compiler warnings sql/sql_load.cc: Added braces around && to get rid of compiler warnings sql/sql_parse.cc: Added braces around && to get rid of compiler warnings sql/sql_partition.cc: Added braces around && to get rid of compiler warnings sql/sql_plugin.cc: Fixed bug in detecing if option variable should be readonly Added empty line before ; for empty while and for loops sql/sql_prepare.cc: Added braces around && to get rid of compiler warnings sql/sql_select.cc: Added braces around && to get rid of compiler warnings Added () around if with assignments Added empty line before ; for empty while and for loops sql/sql_show.cc: Added braces around && to get rid of compiler warnings sql/sql_table.cc: Added braces around && to get rid of compiler warnings sql/sql_trigger.cc: Added braces around && to get rid of compiler warnings sql/sql_update.cc: Added braces around && to get rid of compiler warnings sql/sql_yacc.yy: Added braces around && to get rid of compiler warnings sql/table.cc: Added braces around && to get rid of compiler warnings sql/table.h: Added braces around && to get rid of compiler warnings sql/time.cc: Added braces around && to get rid of compiler warnings sql/tztime.cc: Added braces around && to get rid of compiler warnings sql/uniques.cc: Added braces around && to get rid of compiler warnings storage/federated/ha_federated.cc: Fixed bug in testing of variable to ha_info() (Not critical) storage/heap/ha_heap.cc: Added braces around && to get rid of compiler warnings storage/maria/ha_maria.cc: Fixed bug: Mark that maria_log_dir_path is readonly Added braces around && to get rid of compiler warnings storage/ndb/include/ndbapi/NdbEventOperation.hpp: Removed const before function returning simple type storage/ndb/include/ndbapi/NdbOperation.hpp: Removed const before function returning simple type storage/ndb/src/ndbapi/Ndb.cpp: Added empty line before ; for empty while and for loops storage/ndb/src/ndbapi/NdbEventOperation.cpp: Removed const before function returning simple type storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp: Removed const before function returning simple type storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp: Removed const before function returning simple type storage/ndb/src/ndbapi/NdbRecAttr.cpp: Added empty line before ; for empty while and for loops storage/ndb/src/ndbapi/TransporterFacade.hpp: Added braces around && to get rid of compiler warnings
* | | | lots of post-merge changesSergei Golubchik2011-04-252-2/+2
| |_|/ |/| |
* | | Backport fixes for some of the more noise compiler warnings in ndb.Davi Arnaut2010-07-241-4/+4
| | |
* | | Bug#42733: Type-punning warnings when compiling MySQLDavi Arnaut2010-07-241-11/+11
| | | | | | | | | | | | | | | Post-merge fix: remove remaining casts which are now unnecessary and are actually causing warnings.
* | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Essentially, the problem is that safemalloc is excruciatingly slow as it checks all allocated blocks for overrun at each memory management primitive, yielding a almost exponential slowdown for the memory management functions (malloc, realloc, free). The overrun check basically consists of verifying some bytes of a block for certain magic keys, which catches some simple forms of overrun. Another minor problem is violation of aliasing rules and that its own internal list of blocks is prone to corruption. Another issue with safemalloc is rather the maintenance cost as the tool has a significant impact on the server code. Given the magnitude of memory debuggers available nowadays, especially those that are provided with the platform malloc implementation, maintenance of a in-house and largely obsolete memory debugger becomes a burden that is not worth the effort due to its slowness and lack of support for detecting more common forms of heap corruption. Since there are third-party tools that can provide the same functionality at a lower or comparable performance cost, the solution is to simply remove safemalloc. Third-party tools can provide the same functionality at a lower or comparable performance cost. The removal of safemalloc also allows a simplification of the malloc wrappers, removing quite a bit of kludge: redefinition of my_malloc, my_free and the removal of the unused second argument of my_free. Since free() always check whether the supplied pointer is null, redudant checks are also removed. Also, this patch adds unit testing for my_malloc and moves my_realloc implementation into the same file as the other memory allocation primitives. client/mysqldump.c: Pass my_free directly as its signature is compatible with the callback type -- which wasn't the case for free_table_ent.
* | | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-191-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (make relies GNU extentions). The patch was partially backport from 6.0. Original comment: bug#30708: make relies GNU extensions. Now that we no longer use BitKeeper we can safely remove the SCCS handling with no loss of functionality.
* | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-282-6/+6
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: - storage/archive/ha_archive.cc
| * | | Apply patch on behalf of the NDB team:Davi Arnaut2010-01-202-6/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | 3321 Magnus Blåudd 2010-01-05 BUG#44840 - ndbapi compiler warning - type qualifier ignored for function return type - Remove the "const" - NOTE! This is an ABI incompatible change for some C++ compilers, NdbApi applications using any of the four changed functions may need a recompile if it's using dynamic linking.
* | | 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 from mysql-5.1-bugteam.Alexander Nozdrin2009-09-161-329/+356
|\ \ \ \ | | |/ / | |/| |
| * | | Fix for a few assorted compiler warnings.Davi Arnaut2009-08-281-329/+356
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | client/mysql.cc: Remove leading whitespace. Remove extra text after #else directive. client/mysqldump.c: Function does not take a parameter. mysys/array.c: buffer is a uchar pointer. sql/item.cc: Assert if it should not happen. storage/myisam/mi_check.c: Cast to expected type. This is probably a bug, but it is casted in a similar way in another part of the code. storage/ndb/include/mgmapi/ndb_logevent.h: Apply fix from cluster team. tests/mysql_client_test.c: Remove extraneous slash.
* | | Use sun_prefetch_read_many() and friends, instead of sparc_prefetch_read_many(),MySQL Build Team2009-01-281-2/+2
|/ / | | | | | | | | | | etc. The sparc_* are defined only for sparc, but the sun_* are generic for x86 and sparc (and are defined empty for any other platform).
* | Merge trift2.:/MySQL/M51/ndb-decl-5.1unknown2008-03-271-2/+3
|\ \ | | | | | | | | | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| * | ndb_version.h.in : Fix a syntax error (variable declaration came too late).unknown2008-02-051-2/+3
| |/ | | | | | | | | storage/ndb/include/ndb_version.h.in: C syntax requires variable declarations to be before executable statements.
* | Merge sama.ndb.mysql.com:/export/space/pekka/ndb/version/my50-bug34107unknown2008-01-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sama.ndb.mysql.com:/export/space/pekka/ndb/version/my51-bug34107 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/ndbapi/ndbapi_limits.h: Auto merged storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp: Auto merged storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp: silly stuff storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp: a name was improved in 5.1 storage/ndb/src/ndbapi/ndberror.c: use local due to huge bogus diff
* | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbunknown2008-01-251-11/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb sql/ha_ndbcluster.cc: Auto merged
| * | Ndb.hpp, Ndb.cpp, ha_ndbcluster.cc:unknown2008-01-231-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment. ndb_restore.result: Updated result file mysql-test/suite/ndb/r/ndb_restore.result: Updated result file sql/ha_ndbcluster.cc: Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment. storage/ndb/include/ndbapi/Ndb.hpp: Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment. storage/ndb/src/ndbapi/Ndb.cpp: Add a check if setting an auto_increment field will change it's next value before retrieving tuple_id_range lock. This avoids hitting locks when updating auto_increment values to a lower value than the current maximum. This is useful in loading a table with auto_increment where one loads the highest numbered pk's first and then proceeds backwards to the first. This can then be achieved with the same performance as a normal insert without auto_increment.
| * | Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndbunknown2008-01-221-4/+4
| |/ | | | | | | | | | | | | | | | | | | into mysql.com:/home/marty/MySQL/mysql-5.1-new-ndb storage/ndb/src/ndbapi/Ndb.cpp: Using local, will merge manually. storage/ndb/include/ndbapi/Ndb.hpp: Changed parameter name to better reflect meaning.
* | Merge whalegate.ndb.mysql.com:/home/tomas/cge-5.1unknown2008-01-231-1/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-bj storage/ndb/src/kernel/blocks/ERROR_codes.txt: manual merge
| * \ Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcaunknown2008-01-231-1/+9
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/51-ndb storage/ndb/src/common/util/Bitmask.cpp: merge
| | * Merge perch.ndb.mysql.com:/home/jonas/src/50-telco-gcaunknown2008-01-231-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/51-telco-gca storage/ndb/include/util/Bitmask.hpp: Auto merged storage/ndb/src/common/util/Bitmask.cpp: merge storage/ndb/test/ndbapi/testBitfield.cpp: merge
* | | Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndbunknown2008-01-103-2/+20
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.0/bug30271unknown2007-11-141-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-bug30271 storage/ndb/include/mgmapi/ndb_logevent.h: Auto merged storage/ndb/src/mgmapi/ndb_logevent.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 whalegate.ndb.mysql.com:/home/tomas/cge-5.1unknown2007-12-103-3/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge mysql-test/suite/rpl_ndb/r/rpl_row_basic_7ndb.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/mysqld.cc: Auto merged
| * | | | bug#21072 Duplicate key error in NDB references wrong key: Post-merge fixesunknown2007-12-071-5/+0
| | | | |
| * | | | Merge mysql.com:/home/marty/MySQL/mysql-5.0-ndbunknown2007-12-073-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 whalegate.ndb.mysql.com:/home/tomas/cge-5.1unknown2007-10-3014-13/+179
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-ndb-merge mysql-test/suite/rpl/r/rpl_bug31076.result: Auto merged sql/ha_ndbcluster.cc: Auto merged sql/handler.cc: Auto merged sql/log_event.cc: Auto merged sql/sql_update.cc: Auto merged storage/ndb/include/ndbapi/Ndb.hpp: Auto merged mysql-test/suite/rpl/t/rpl_bug31076.test: manual 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-234-4/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-simple-readunknown2007-10-152-2/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into perch.ndb.mysql.com:/home/jonas/src/51-ndb storage/ndb/include/ndbapi/NdbOperation.hpp: Auto merged
| | * | | | ndb - bug#31482unknown2007-10-152-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (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
| * | | | | Fixed a typo. We have NdbTransactions not NdbTransations. unknown2007-10-121-1/+1
| | | | | |
View Lorry Controller Status