summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
Commit message (Collapse)AuthorAgeFilesLines
* Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1tomas@whalegate.ndb.mysql.com2007-05-211-1/+1
|\ | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1kostja@vajra.(none)2007-05-151-1/+1
| |\ | | | | | | | | | into vajra.(none):/opt/local/work/mysql-5.1-runtime
| | * Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-basemalff/marcsql@weblab.(none)2007-05-021-1/+1
| | |\ | | | | | | | | | | | | into weblab.(none):/home/marcsql/TREE/mysql-5.1-rt-merge
| | | * manual merge 5.0-runtime -> 5.1->runtime, with 25411 part Imalff/marcsql@weblab.(none)2007-04-251-1/+1
| | | |
* | | | corrected manual mergetomas@whalegate.ndb.mysql.com2007-05-141-1/+2
| | | |
* | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-05-141-25/+35
|\ \ \ \ | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * | | | Bug #28410 ndb: no retry sleep when getting autoincrementtomas@whalegate.ndb.mysql.com2007-05-141-23/+36
| | | | | | | | | | | | | | | | | | | | - add retry sleep to allow temprary error to go away
* | | | | Bug#25818 No return of NDB share object in failures in open methodtomas@whalegate.ndb.mysql.com2007-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | - correct manual/auto merge to 5.1
* | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-05-111-9/+15
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * | | Bug#25818 No return of NDB share object in failures in open methodtomas@whalegate.ndb.mysql.com2007-05-111-9/+18
| | | | | | | | | | | | | | | | - make sure resources are release properly on error
| * | | ndb_insert.test, ndb_insert.result, ha_ndbcluster.cc:mskold/marty@mysql.com/linux.site2007-05-021-2/+40
| | | | | | | | | | | | | | | | Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values
| * | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0tomas@whalegate.ndb.mysql.com2007-04-271-4/+4
| |\ \ \ | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| | * \ \ Merge debian.(none):/M50/mysql-5.0joerg@debian.(none)2007-04-201-4/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | into debian.(none):/M50/push-5.0
| * | \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gcatomas@whalegate.ndb.mysql.com2007-04-251-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| * \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbtomas@whalegate.ndb.mysql.com2007-04-241-1417/+71
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndb
| | * | | | | Moved all code related to engine_condition_pushdown to a new class,mskold/marty@mysql.com/linux.site2007-04-231-1416/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ha_ndbcluster_cond. Added new files: sql/ha_ndbcluster_cond.h sql/ha_ndbcluster_cond.cc
| | * | | | | Commented out buggy debugging codemskold/marty@mysql.com/linux.site2007-04-191-1/+1
| | | | | | |
| * | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0jamppa@bk-internal.mysql.com2007-04-171-33/+149
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | into bk-internal.mysql.com:/data0/bk/mysql-5.0-marvel
| * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0jani@ua141d10.elisa.omakaista.fi2007-04-121-20/+53
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvel
| * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvelserg@janus.mylan2007-04-021-5/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-5.0
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0serg@janus.mylan2007-03-301-2/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into janus.mylan:/usr/home/serg/Abk/mysql-5.0
* | \ \ \ \ \ \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-opttomas@whalegate.ndb.mysql.com2007-05-101-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * \ \ \ \ \ \ \ \ \ Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bjgni@dev3-221.dev.cn.tlan2007-05-081-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb
| | * \ \ \ \ \ \ \ \ \ Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bjgni@dev3-221.dev.cn.tlan2007-04-241-3/+3
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/bug18676
| | | * | | | | | | | | | BUG#18676 In order to coincide with 5.0 mysqld error code after bug#18676, ↵gni/root@dev3-221.dev.cn.tlan2007-04-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map the 4009 ndb error code to 157 mysql error code
* | | | | | | | | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-05-071-23/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/home/antony/work2/mysql-5.1-merge
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-05-041-23/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | into xiphis.org:/home/antony/work2/mysql-5.1-engines.merge
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesistruewing@chilla.local2007-04-271-23/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into chilla.local:/home/mydev/mysql-5.1-wl2936-two
| | | * | | | | | | | | | | | mysql-test/t/ndb_dd_basic.testserg@janus.mylan2007-04-191-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixed the test sql/ha_ndbcluster.cc LOCK_plugin is used in ha_ndbcluster.cc sql/sql_plugin.cc LOCK_plugin is used in ha_ndbcluster.cc
| | | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@sergbook.mysql.com2007-04-161-23/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into sergbook.mysql.com:/usr/home/serg/Abk/mysql-5.1-wl2936
| | | | * | | | | | | | | | | | WL#2936antony@ppcg5.local2007-03-021-24/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Server Variables for Plugins" Implement support for plugins to declare server variables. Demonstrate functionality by removing InnoDB specific code from sql/* New feature for HASH - HASH_UNIQUE flag New feature for DYNAMIC_ARRAY - initializer accepts preallocated ptr. Completed support for plugin reference counting.
* | | | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-05-071-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/d2/hf/mrg/mysql-5.1-opt
| * | | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@hfmain.(none)2007-04-301-6/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/home/hf/work/27123/my51-27123
| | * | | | | | | | | | | | | | Bug #27123 (partition + on duplicate key update + varchar = Can't findholyfoot/hf@mysql.com/hfmain.(none)2007-04-191-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | record in table) key_restore function didn't work as intended in the case of VARCHAR or BLOB fields, stored the restored key in field->ptr instead of to_record. That produced the wrong key so search returned wrong result
* | | | | | | | | | | | | | | | ha_ndbcluster.cc:mskold/marty@mysql.com/linux.site2007-05-021-1/+38
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug#27980 INSERT IGNORE wrongly ignores NULLs in unique index: added check for null values
* | | | | | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1tomas@whalegate.ndb.mysql.com2007-04-271-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * | | | | | | | | | | | | | Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1joerg@trift-lap.fambruehe2007-04-261-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into trift-lap.fambruehe:/MySQL/M51/push-5.1
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge debian.(none):/M51/mysql-5.1joerg@debian.(none)2007-04-231-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into debian.(none):/M51/push-5.1
| | | * | | | | | | | | | | | | Merge debian.(none):/M51/mysql-5.1joerg@debian.(none)2007-04-201-4/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into debian.(none):/M51/push-5.1
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M50/fix-ndb-5.0joerg@trift2.2007-04-181-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | / | | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | into trift2.:/MySQL/M51/push-5.1
| | | | * | | | | | | | | | | | sql/ha_ndbcluster.ccjoerg@trift2.2007-04-181-4/+4
| | | | | |_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hex constants that exceed 32 bit need to be marked "LL" for the compile to work.
| | | | * | | | | | | | | | | Bug #27758 Restoring NDB backups makes table usable in SQL nodestomas@whalegate.ndb.mysql.com2007-04-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - parse indexname using "split" instead of sscanf, as not to break at space - test case with space in key - enclose names in printout
* | | | | | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gcatomas@whalegate.ndb.mysql.com2007-04-261-3/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * | | | | | | | | | | | | | | WL#1190 preparatory work needed for compatability with future online add columntomas@whalegate.ndb.mysql.com2007-04-261-0/+64
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Bug #24667 After ALTER TABLE operation ndb_dd table becomes regular ndbtomas@whalegate.ndb.mysql.com2007-04-261-29/+35
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gcatomas@whalegate.ndb.mysql.com2007-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
| * | | | | | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gcatomas@whalegate.ndb.mysql.com2007-04-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
| | * | | | | | | | | | | | | | Bug #28093 ndb: retry sleep in get table stats 30s instead of 30mstomas@whalegate.ndb.mysql.com2007-04-251-1/+1
| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndbmskold/marty@linux.site2007-04-241-1378/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mysql.com:/windows/Linux_space/MySQL/mysql-5.1-new-ndb
| * | | | | | | | | | | | | | | ha_ndbcluster.h, ha_ndbcluster.cc:mskold/marty@mysql.com/linux.site2007-04-241-1378/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored code for engine_condition_pushdown to ha_ndbcluster_cond Makefile.am: Added compilation of ha_ndbcluster_cond ha_ndbcluster_cond.h, ha_ndbcluster_cond.cc: Merge