summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 5.1-security->5.5-security mergeSergey Glukhov2010-11-183-5/+23
|\
| * Bug#58022 ... like ... escape export_set ( ... ) crashes when export_set retu...Sergey Glukhov2010-11-183-5/+19
* | mergeMattias Jonsson2010-11-172-1/+3
|\ \ | |/
| * post-push fix, backported --replace_result patchMattias Jonsson2010-11-173-4/+8
* | mergeMattias Jonsson2010-11-151-0/+3
|\ \ | |/
| * post-push fix for test to pass on windowsMattias Jonsson2010-11-151-0/+3
* | Null-mergeMattias Jonsson2010-11-152-0/+137
|\ \ | |/
| * mergeMattias Jonsson2010-11-153-1/+159
| |\
| | * Bug#55091: Server crashes on ADD PARTITION after a failed attemptMattias Jonsson2010-10-054-2/+159
* | | Merging from mysql-5.1-securityAlexander Barkov2010-11-123-7/+37
|\ \ \ | |/ /
| * | Bug#58005 utf8 + get_format causes failed assertion: !str || str != Ptr'Alexander Barkov2010-11-123-7/+37
* | | Merging from mysql-5.1-securityAlexander Barkov2010-11-116-3/+50
|\ \ \ | |/ /
| * | Bug#57257 Replace(ExtractValue(...)) causes MySQL crashAlexander Barkov2010-11-116-3/+50
| * | null mergeSergey Glukhov2010-11-080-0/+0
| |\ \
| | * | Bug#52711 Segfault when doing EXPLAIN SELECT with union...order by (select......Sergey Glukhov2010-11-083-2/+40
| | * | Fix for bug #54575: crash when joining tables with unique set column(backport...Sergey Glukhov2010-11-083-5/+34
| * | | Raise version number after cloning 5.1.53karen.langford@oracle.com2010-11-031-1/+1
* | | | Bug#57687 crash when reporting duplicate group_key error and utf8Alexander Barkov2010-11-113-3/+24
* | | | Auto-merged.Evgeny Potemkin2010-11-0487-402/+1531
|\ \ \ \
| * | | | Bug #57130 crash in Item_field::print during SHOW CREATE TABLE or VIEWJon Olav Hauglid2010-11-033-2/+105
| * | | | mergeGeorgi Kodinov2010-11-030-0/+0
| |\ \ \ \ | | |/ / /
| | * | | mergeGeorgi Kodinov2010-11-030-0/+0
| | |\ \ \
| | | * \ \ Merge from mysql-5.1.52-releasekaren.langford@oracle.com2010-11-01155-1815/+4059
| | | |\ \ \
| | | | * | | Fix bug #57345karen.langford@oracle.com2010-10-113-3/+31
| * | | | | | fixed the .spec file to package the new QA plugins.Georgi Kodinov2010-11-011-0/+10
| * | | | | | fixed a failure in the build scripts because of unexpected suffixGeorgi Kodinov2010-11-011-1/+1
| * | | | | | 5.1-sucurity->5.5-security mergeSergey Glukhov2010-11-011-0/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | test case fixSergey Glukhov2010-11-011-0/+2
| * | | | | | Bug #57659 Segfault in Query_cache::invalidate_data for TRUNCATE TABLEJon Olav Hauglid2010-10-293-0/+88
| * | | | | | mergeGeorgi Kodinov2010-10-291-0/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | mergeGeorgi Kodinov2010-10-290-0/+0
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | merge to 5.0-securityGeorgi Kodinov2010-10-295-19/+92
| | | |\ \ \ \
| | * | \ \ \ \ merge to 5.1-securityGeorgi Kodinov2010-10-29155-698/+5737
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ merge to 5.1-securityGeorgi Kodinov2010-10-290-0/+0
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | | * | | | | | Null-merge from mysql-5.1.49sp1-releasehery.ramilison@sun.com2010-10-070-0/+0
| | | |\ \ \ \ \ \
| | | | * | | | | | Backport into mysql-5.1.49sp1-releasesmenon2010-09-281-1/+1
| | | | * | | | | | Backport into mysql-5.1.49sp1-releasesmenon2010-09-284-12/+45
| | | | * | | | | | Set version number for mysql-5.1.49sp1 releasehery.ramilison@sun.com2010-09-281-1/+1
| * | | | | | | | | fix tree nameGeorgi Kodinov2010-10-291-3/+3
| * | | | | | | | | mergeGeorgi Kodinov2010-10-29353-3382/+9758
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug #57774: Typos/ambiguities in the WL1054 commentsGeorgi Kodinov2010-10-273-25/+15
| | * | | | | | | | | Merge mysql-5.1-bugteam -> mysql-5.5-bugteam (empty)Vasil Dimov2010-10-290-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1-bugteamVasil Dimov2010-10-2954-350/+4361
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge mysql-5.5-innodb -> mysql-5.5-bugteamVasil Dimov2010-10-2916-163/+151
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Merge fix for bug#57616 from mysql-5.5-security to mysql-5.5-innodb.Jimmy Yang2010-10-281-2/+2
| | | * | | | | | | | | | Fix a compilation warning:Vasil Dimov2010-10-281-1/+1
| | | * | | | | | | | | | Null merge mysql-5.1-innodb --> mysql-5.5-innodbCalvin Sun2010-10-280-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Bug#52062: Compiler warning in os0file.c on windows 64-bitCalvin Sun2010-10-281-6/+22
| | | | * | | | | | | | | Bug#52062: Compiler warning in os0file.c on windows 64-bitCalvin Sun2010-10-271-4/+20
| | | * | | | | | | | | | Bug#52062: Compiler warning in os0file.c on windows 64-bitCalvin Sun2010-10-281-3/+21