summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* merge: 5.1 -> 5.1-rplLuis Soares2009-01-2327-402/+959
|\
| * Bug#31177: Server variables can't be set to their current valuesTatiana A. Nurnberg2009-01-121-3/+3
| * merged 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-01-057-13/+9
| |\
| * | Bug#41441 repair csv table crashes debug serverSergey Glukhov2008-12-291-0/+11
| * | Auto-merge from 5.1-bugteamTimothy Smith2008-12-192-2/+2
| |\ \
| | * | Fix warnings and bug spotted by gcc-4.3.Davi Arnaut2008-12-162-2/+2
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 15. FixesTimothy Smith2008-12-147-212/+137
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 14. FixesTimothy Smith2008-12-142-13/+88
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 13. FixesTimothy Smith2008-12-143-61/+38
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 12.Timothy Smith2008-12-141-6/+15
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 11. White space changes.Timothy Smith2008-12-141-2/+2
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 10.Timothy Smith2008-12-141-2/+3
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 9. Improve a comment.Timothy Smith2008-12-141-1/+2
| * | | Apply InnoDB snapshot innodb-5.1-2858, part 8. FixesTimothy Smith2008-12-141-0/+127
| * | | Apply InnoDB snapshot innodb-5.1-2858, part 7.Timothy Smith2008-12-145-39/+116
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 6.Timothy Smith2008-12-141-6/+13
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 5.Timothy Smith2008-12-141-0/+6
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 4. FixesTimothy Smith2008-12-141-3/+18
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 3.Timothy Smith2008-12-141-1/+1
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 2. FixesTimothy Smith2008-12-143-29/+85
| * | | Apply InnoDB snapshot innodb-5.1-ss2858, part 1. FixesTimothy Smith2008-12-141-6/+16
| * | | Apply InnoDB snapshot innodb-5.1-ss2637, part 3. FixesTimothy Smith2008-12-141-0/+8
| * | | Apply InnoDB snapshot innodb-5.1-ss2637, part 2. FixesTimothy Smith2008-12-141-6/+17
| * | | Apply InnoDB snapshot innodb-5.1-ss2637, part 1. FixesTimothy Smith2008-12-143-12/+26
| * | | Complete application of InnoDB snapshot innodb-5.1-ss2545.Timothy Smith2008-12-143-0/+101
| * | | Complete application of InnoDB snapshot innodb-5.1-ss2485, part 2. FixesTimothy Smith2008-12-141-7/+8
| * | | Complete application of InnoDB snapshot innodb-5.1-ss2485, part 1. FixesTimothy Smith2008-12-143-12/+51
| * | | Complete applying InnoDB snapshot innodb-5.1-ss2479. FixesTimothy Smith2008-12-142-6/+49
| * | | Completing snapshot innodb-5.1-ss2438, part 3.Timothy Smith2008-12-142-38/+43
| * | | Completing snapshot innodb-5.1-ss2438, part 2. FixesTimothy Smith2008-12-141-1/+9
| * | | Completing snapshot innodb-5.1-ss2438, part 1. FixesTimothy Smith2008-12-142-2/+6
| |/ /
| * | Merge.Sergey Vojtovich2008-12-091-6/+32
* | | merge: 5.1 -> 5.1-rplLuis Soares2009-01-087-13/+9
|\ \ \ | | |/ | |/|
| * | Merge from mysql-5.1.30-releaseunknown2008-11-277-13/+9
| |\ \ | | |/ | |/|
| | * mysql-test/r/partition.resultBuild Team2008-11-253-7/+3
| | * Changes of copyright output from "--version" and similar.unknown2008-11-143-4/+4
| | * Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-102-2/+2
* | | merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r...Andrei Elkin2008-11-121-1/+1
|\ \ \ | |/ /
| * | Bug#37719: Crash if rename Archive table to same name with differentMattias Jonsson2008-10-031-1/+1
| |/
* | Merging 5.1 main into 5.1-rplMats Kindahl2008-10-232-2/+36
|\ \ | |/
| * Bug #38360: BLACKHOLE replication with RBR is brokenMats Kindahl2008-10-022-2/+36
* | Merge 5.1 main -> 5.1-rplHe Zhenxing2008-09-0619-100/+177
|\ \ | |/
| * MergeRamil Kalimullin2008-08-262-3/+3
| * merging fixesAlexey Botchkov2008-08-261-1/+1
| * mergingAlexey Botchkov2008-08-235-14/+48
| * Cherry-pick some changes from innodb-5.1-ss2545 snapshot. Includes fixes forTimothy Smith2008-08-203-7/+59
| * Cherry-pick one change from innodb-5.1-ss2485 snapshot. Fixes Bug#35602.Timothy Smith2008-08-191-1/+2
| * Cherry-pick some changes from innodb-5.1-ss2479 snapshot. Includes fixes forTimothy Smith2008-08-198-55/+41
| * Cherry-pick one part of innodb-5.1-ss2438 snapshot.Timothy Smith2008-08-191-1/+1
| * Merge from 5.0-bugteam.Chad MILLER2008-08-151-0/+3