summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Manual merge with Conflicts:unknown2010-01-2541-339/+721
|\
| * Backport Bug#37148 to 5.1He Zhenxing2010-01-2428-159/+472
| * Merge InnoDB snapshot with mysql-5.1-bugteam.Sergey Vojtovich2010-01-229-169/+223
| |\
| | * Applying InnoDB snapshot, fixes BUG#49396.Sergey Vojtovich2010-01-221-2/+4
| | * Disabled innodb-autoinc-44030 due to BUG#47621.Sergey Vojtovich2010-01-221-0/+1
| | * Applying InnoDB snapshot Sergey Vojtovich2010-01-221-1/+1
| | * Applying InnoDB snapshot Sergey Vojtovich2010-01-222-0/+64
| | * Applying InnoDB snapshot Sergey Vojtovich2010-01-222-55/+0
| | * Applying InnoDB snapshot, fixes BUG#46193.Sergey Vojtovich2010-01-222-103/+131
| | * Applying InnoDB snapshot Sergey Vojtovich2010-01-222-5/+5
| | * Applying InnoDB snapshot, fixes BUG#49238.Sergey Vojtovich2010-01-221-9/+23
| * | Bug#49501 Inefficient information_schema check (system collation), addonSergey Glukhov2010-01-226-8/+13
| * | Post-commit fix of two testsMagne Mahre2010-01-222-3/+5
| |/
* | Bug #49132 Replication failure on temporary table + DDLunknown2010-01-2211-34/+526
|/
* WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-2115-24/+92
* Apply patch on behalf of Magnus:Davi Arnaut2010-01-201-1/+1
* Apply patch on behalf of the NDB team:Davi Arnaut2010-01-205-18/+18
* BUG#46364 MyISAM transbuffer problems (NTM problem)Alfranio Correia2010-01-208-8/+2170
* post-push patch for bug#47343.Mattias Jonsson2010-01-191-0/+1
* Bug #49512 : subquery with aggregate function crashGeorgi Kodinov2009-12-233-0/+29
* revert of the fix for bug #45989: pushed by mistake.Georgi Kodinov2010-01-193-31/+0
* mergeMattias Jonsson2010-01-197-28/+157
|\
| * Bug#47343: InnoDB fails to clean-up after lock wait timeout onMattias Jonsson2010-01-187-28/+157
* | mergeGeorgi Kodinov2010-01-199-41/+49
|\ \
| * | Bug#49501 Inefficient information_schema check (system collation)Sergey Glukhov2010-01-199-41/+49
* | | Bug #45989 take 2 : memory leak after explain encounters anGeorgi Kodinov2010-01-183-0/+31
|/ /
* | Fix for BUG#49481 and BUG#49482 reverted.Luis Soares2010-01-194-153/+2
* | mergeMattias Jonsson2010-01-173-26/+793
|\ \
| * | Bug#49742: Partition Pruning not working correctly for RANGEMattias Jonsson2009-12-223-26/+793
* | | BUG#47418 RBR fails, failure with mixup of base/temporary/view unknown2010-01-168-18/+106
* | | Bug #46175: NULL read_view and consistent read assertionGeorgi Kodinov2010-01-152-1/+13
| |/ |/|
* | mergeGeorgi Kodinov2010-01-1510-34/+390
|\ \
| * | Fix for BUG#49481 and BUG#49482.Luis Soares2010-01-144-2/+153
| * | BUG#50018: binlog corruption when table has many columnsLuis Soares2010-01-141-1/+1
| * | BUG#50018: automerge from 5.1-bt local --> 5.1-bt local latest.Luis Soares2010-01-143-21/+212
| |\ \
| | * | BUG#50018: binlog corruption when table has many columnsLuis Soares2010-01-072-561/+150
| | * | BUG#50018: binlog corruption when table has many columnsLuis Soares2010-01-065-358/+960
| * | | automergeKristofer Pettersson2010-01-1356-127/+600
| |\ \ \
| * | | | Bug#33982 debug assertion and crash reloading grant tables after sighup or killKristofer Pettersson2010-01-133-10/+24
| | |/ / | |/| |
* | | | merge of version change.Georgi Kodinov2010-01-152-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | version changeGeorgi Kodinov2010-01-141-1/+1
* | | | Merge of fix for Bug#48157.Martin Hansson2010-01-1325-80/+206
|\ \ \ \
| * \ \ \ Auto-merge.Ramil Kalimullin2010-01-137-6/+47
| |\ \ \ \
| | * \ \ \ mergeGeorgi Kodinov2010-01-132-6/+9
| | |\ \ \ \
| | * | | | | version changeGeorgi Kodinov2010-01-131-1/+1
| | * | | | | merge 5.1-main to 5.1-bugteamGeorgi Kodinov2010-01-138-7/+48
| | |\ \ \ \ \
| | | * \ \ \ \ MergeKent Boortz2009-12-301-1/+14
| | | |\ \ \ \ \
| | | | * | | | | Removed unwanted Perl DBI dependencyKent Boortz2009-12-301-1/+14
| | | | * | | | | MergeMySQL Build Team2009-12-169-106/+501
| | | | |\ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Fix for bug#49517: Inconsistent behavior while using Ramil Kalimullin2009-12-154-3/+32