summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
Commit message (Expand)AuthorAgeFilesLines
* Merged from main 5.1unknown2007-05-241-1/+1
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-241-152/+156
|\
| * WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-101-144/+148
* | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1unknown2007-05-211-1/+1
|\ \
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-151-1/+1
| |\ \
| | * \ Merge weblab.(none):/home/marcsql/TREE/mysql-5.1-baseunknown2007-05-021-1/+1
| | |\ \ | | | |/ | | |/|
| | | * manual merge 5.0-runtime -> 5.1->runtime, with 25411 part Iunknown2007-04-251-1/+1
* | | | corrected manual mergeunknown2007-05-141-1/+2
* | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbunknown2007-05-141-25/+35
|\ \ \ \
| * | | | Bug #28410 ndb: no retry sleep when getting autoincrementunknown2007-05-141-23/+36
* | | | | Bug#25818 No return of NDB share object in failures in open methodunknown2007-05-111-2/+2
* | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-ndbunknown2007-05-111-9/+15
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | Bug#25818 No return of NDB share object in failures in open methodunknown2007-05-111-9/+18
| * | | ndb_insert.test, ndb_insert.result, ha_ndbcluster.cc:unknown2007-05-021-2/+40
| * | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0unknown2007-04-271-4/+4
| |\ \ \
| | * \ \ Merge debian.(none):/M50/mysql-5.0unknown2007-04-201-4/+4
| | |\ \ \
| * | \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gcaunknown2007-04-251-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0-ndbunknown2007-04-241-1417/+71
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Moved all code related to engine_condition_pushdown to a new class,unknown2007-04-231-1416/+70
| | * | | | | Commented out buggy debugging codeunknown2007-04-191-1/+1
| * | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-04-171-33/+149
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-04-121-20/+53
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2007-04-021-5/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-03-301-2/+1
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-optunknown2007-05-101-3/+3
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bjunknown2007-05-081-3/+3
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge dev3-221.dev.cn.tlan:/home/ngb/mysql/mysql-5.1/mysql-5.1-new-ndb-bjunknown2007-04-241-3/+3
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | BUG#18676 In order to coincide with 5.0 mysqld error code after bug#18676, Ma...unknown2007-04-161-3/+3
* | | | | | | | | | | | | Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesunknown2007-05-071-23/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge xiphis.org:/home/antony/work2/mysql-5.1-enginesunknown2007-05-041-23/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2007-04-271-23/+22
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | mysql-test/t/ndb_dd_basic.testunknown2007-04-191-0/+12
| | | * | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-161-23/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | WL#2936unknown2007-03-021-24/+11
* | | | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1unknown2007-05-071-6/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.1-optunknown2007-04-301-6/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Bug #27123 (partition + on duplicate key update + varchar = Can't findunknown2007-04-191-6/+2
* | | | | | | | | | | | | | | | ha_ndbcluster.cc:unknown2007-05-021-1/+38
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1unknown2007-04-271-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge trift-lap.fambruehe:/MySQL/M51/mysql-5.1unknown2007-04-261-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge debian.(none):/M51/mysql-5.1unknown2007-04-231-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge debian.(none):/M51/mysql-5.1unknown2007-04-201-4/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M50/fix-ndb-5.0unknown2007-04-181-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | / | | | | | |_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | sql/ha_ndbcluster.ccunknown2007-04-181-4/+4
| | | | | |_|_|_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Bug #27758 Restoring NDB backups makes table usable in SQL nodesunknown2007-04-121-2/+4
* | | | | | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gcaunknown2007-04-261-3/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | WL#1190 preparatory work needed for compatability with future online add columnunknown2007-04-261-0/+64
| * | | | | | | | | | | | | | | Bug #24667 After ALTER TABLE operation ndb_dd table becomes regular ndbunknown2007-04-261-29/+35
* | | | | | | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gcaunknown2007-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.0-telco-gcaunknown2007-04-251-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | |