summaryrefslogtreecommitdiff
path: root/sql/ha_ndbcluster.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | 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
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #28093 ndb: retry sleep in get table stats 30s instead of 30msunknown2007-04-251-1/+1
* | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-ndbunknown2007-04-241-1378/+31
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | ha_ndbcluster.h, ha_ndbcluster.cc:unknown2007-04-241-1378/+31
* | | | | | | | | | | | Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.1unknown2007-04-231-23/+23
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-userunknown2007-04-201-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | / / / / / | | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Bug#24667 After ALTER TABLE operation ndb_dd table becomes regular ndb, Bug ...unknown2007-04-181-23/+23
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge romeo.(none):/home/bkroot/mysql-5.1-rplunknown2007-04-201-26/+101
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2007-04-171-4/+3
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Clear field_alloc when it's moved to result set (allows us to always call fre...unknown2007-04-161-1/+1
| | * | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-101-3/+2
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | | * | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-041-3/+2
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-04-031-3/+2
| | | | |\ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvelunknown2007-03-291-3/+2
| | | | | |\ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-mainunknown2007-03-281-5/+7
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Fixed compiler warnings.unknown2007-03-221-16/+20
| | | | | | | * | | | | | | Bug#25668 mysqld may core if cluster disconnectedunknown2007-01-241-1/+1
| | | | | | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-ndbunknown2006-10-251-15/+49
| | | | | | | |\ \ \ \ \ \ \
| | | | | | * | \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2007-03-241-2/+1
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF() unknown2007-03-241-1/+1
| | | | | | | * | | | | | | | | Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()unknown2007-03-231-2/+1
| * | | | | | | | | | | | | | | correct merge errorunknown2007-04-111-11/+5