summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* BUG#18198: Partition function bugmikael/pappa@dator5.(none)2006-07-132-15/+1
* Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug18198mikael/pappa@dator5.(none)2006-07-1215-142/+309
|\
| * BUG#18198: Fixmikael/pappa@dator5.(none)2006-07-121-2/+0
| * Merge dator5.(none):/home/pappa/clean-mysql-5.1mikael@dator5.(none)2006-06-2315-142/+310
| |\
| | * BUG#18198: Less flexibility in defining partition functionsmikael@dator5.(none)2006-06-2312-140/+262
| | * BUG#18198: Too flexible partition functionsmikael@dator5.(none)2006-06-203-2/+48
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1konstantin@bodhi.netgear2006-07-078-61/+71
|\ \ \
| * | | removed alter table partition error test since it cannot be made predictable....tomas@poseidon.ndb.mysql.com2006-07-072-43/+0
| * | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1tomas@poseidon.ndb.mysql.com2006-07-068-28/+81
| |\ \ \
| | * | | Bug #20820 auto inc table not handled correctly when restored from cluster ba...tomas@poseidon.ndb.mysql.com2006-07-065-13/+28
| | * | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.ndb.mysql.com2006-07-065-23/+61
| | |\ \ \
| | | * | | Bug #20820 auto inc table not handled correctly when restored from cluster ba...tomas@poseidon.ndb.mysql.com2006-07-065-26/+65
* | | | | | Merge bodhi.netgear:/opt/local/work/mysql-5.1-rootkonstantin@bodhi.netgear2006-07-062-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | fix test. this should remove the problem of andrey@lmy004.2006-07-043-2/+3
* | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1joerg@trift2.2006-07-062-13/+17
|\ \ \ \ \ \
| * \ \ \ \ \ Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516).joerg@mysql.com2006-06-292-13/+17
| |\ \ \ \ \ \
| | * \ \ \ \ \ Manual merge for bug#20216.joerg@mysql.com2006-06-271-1/+3
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216),joerg@mysql.com2006-06-271-1/+5
| | | |\ \ \ \ \ \
| | | | * | | | | | Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216).joerg@mysql.com2006-06-271-1/+5
| | * | | | | | | | Revert all previous attempts to call "mysql_upgrade" during RPM upgrade.joerg@mysql.com2006-06-271-19/+7
| | * | | | | | | | Merge mysql.com:/M50/bug19353-5.0-2 into mysql.com:/M50/bug20216-5.0joerg@mysql.com2006-06-274-8/+22
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | The binary "mysql_upgrade" must be included in the distribution. (bug#18516 +...joerg@mysql.com2006-06-231-1/+1
| | | * | | | | | | | Improved fix for bug#18516 (also 19353):joerg@mysql.com2006-06-223-7/+21
* | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1joerg@trift2.2006-07-061-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge mysql.com:/M50/merge-5.0 into mysql.com:/M51/merge-5.1joerg@trift2.2006-07-051-0/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Extend the Perl script running the test suite to produce a "Logging:" line (l...joerg@mysql.com2006-07-051-0/+5
* | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbtomas@poseidon.ndb.mysql.com2006-07-062-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | corrected result filetomas@poseidon.ndb.mysql.com2006-07-062-2/+2
| * | | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.ndb.mysql.com2006-07-060-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1tomas@poseidon.ndb.mysql.com2006-07-061-5/+8
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | backport of ndb DictCache fixtomas@poseidon.ndb.mysql.com2006-07-061-5/+8
* | | | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbjonas@perch.ndb.mysql.com2006-07-0694-277/+4786
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1tomas@poseidon.ndb.mysql.com2006-07-066-1/+3192
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1tomas@poseidon.ndb.mysql.com2006-07-066-1/+3192
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | corrected resultstomas@poseidon.ndb.mysql.com2006-07-062-4/+6
| | | * | | | | | | | | | | | | Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbngrishakin@ndb15.mysql.com2006-07-064-0/+3186
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | ndb_dd_advance test casesngrishakin@mysql.com2006-07-064-0/+3186
| | | * | | | | | | | | | | | | | Bug #20843 tests fails randomly with assertion in completeClusterFailedtomas@poseidon.ndb.mysql.com2006-07-062-1/+4
| | | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1mskold@linux.site2006-07-063-0/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1mskold@linux.site2006-07-053-0/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Bug #19645 Data Node hangs in phase 100: post review fix, removed test printoutmskold@mysql.com2006-07-051-2/+0
| | | * | | | | | | | | | | | | | Bug #19645 Data Node hangs in phase 100: distribute API_FAIL_REQ so all node...mskold@mysql.com2006-07-053-0/+27
| * | | | | | | | | | | | | | | | .del-ndb_dd_advance.result~165b282a93715547:ngrishakin@mysql.com2006-07-054-3186/+0
| * | | | | | | | | | | | | | | | Merge ngrishakin@bk-internal.mysql.com:/home/bk/mysql-5.1ngrishakin@ndb15.mysql.com2006-07-0510-45/+132
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | disabled ndb_autodiscover3 againtomas@poseidon.ndb.mysql.com2006-07-051-0/+1
| | | |_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1tomas@poseidon.ndb.mysql.com2006-07-056-31/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Bug #20843 tests fails randomly with assertion in completeClusterFailedtomas@poseidon.ndb.mysql.com2006-07-051-4/+0
| | | * | | | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.ndb.mysql.com2006-07-051-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | ndbd: added missing jamEntry();tomas@poseidon.ndb.mysql.com2006-07-051-0/+2
| | | * | | | | | | | | | | | | Merge poseidon.ndb.mysql.com:/home/tomas/mysql-5.0tomas@poseidon.ndb.mysql.com2006-07-053-9/+10
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / /