summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge of mysql-5.1 into mysql-5.5.Davi Arnaut2011-03-143-1/+26
|\
| * Bug#11765202: Dbug_violation_helper::~Dbug_violation_helper(): Assertion `!_e...Davi Arnaut2011-03-143-1/+26
* | Bug#11858960 - WINDOWS SERVICE FAILING TO START IMMEDIATELY AFTER Magne Mahre2011-03-141-0/+5
* | A patch for Bug#11765297 (58251 - archive_plugin and blackhole_pluginAlexander Nozdrin2011-03-144-0/+22
* | Fight a problem in internal test builds:Joerg Bruehe2011-03-111-4/+16
* | null upmergeBjorn Munch2011-03-110-0/+0
|\ \ | |/
| * merge from 5.1-mtrBjorn Munch2011-03-1167-11/+124
| |\
* | \ merge from 5.5-mtrBjorn Munch2011-03-1190-24/+264
|\ \ \
| * \ \ null upmergeBjorn Munch2011-03-110-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | merge from 5.1 mainBjorn Munch2011-03-1110-56/+534
| | |\ \
| * | \ \ merge from 5.5 mainBjorn Munch2011-03-1125-91/+1015
| |\ \ \ \
| * | | | | Add extra line after unit test report in MTRBjorn Munch2011-03-081-2/+5
| * | | | | null upmergeBjorn Munch2011-03-080-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | merge from 5.1 mainBjorn Munch2011-03-0814-12/+152
| | |\ \ \ \
| * | \ \ \ \ merge from 5.5 mainBjorn Munch2011-03-0873-294/+991
| |\ \ \ \ \ \
| * | | | | | | Fix non-portable test of %p in unit test my_vsnprintfBjorn Munch2011-03-021-1/+4
| * | | | | | | Attempt at solving missing end of mtr output on WindowsBjorn Munch2011-02-281-0/+2
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | Attempt at solving missing end of mtr output on WindowsBjorn Munch2011-02-281-0/+2
| * | | | | | | mtr: ignore not finding ctest if in PB2Bjorn Munch2011-02-251-1/+2
| * | | | | | | vs-config option to ctest made not dependent on WindowsBjorn Munch2011-02-241-2/+2
| * | | | | | | null upmergeBjorn Munch2011-02-240-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | merge from 5.1 mainBjorn Munch2011-02-2459-641/+1930
| | |\ \ \ \ \ \
| * | | | | | | | 11762407 follow-up fixes to a few testsBjorn Munch2011-02-244-0/+4
| * | | | | | | | merge from 5.5 mainBjorn Munch2011-02-24163-1584/+4506
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 11766640 follow-up: fix for VS_CONFIG on WindowsBjorn Munch2011-02-242-4/+7
| * | | | | | | | | Upmerge 11762407 (54999) with additionsBjorn Munch2011-02-2380-17/+152
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Bug #11762407 54999: MTR GLOBAL SUPPRESSION HIDES SQL THREAD EXECUTION UNEXPE...Bjorn Munch2011-02-2366-11/+122
| * | | | | | | | | Bug #11766640 (59789) Hook the invocation of unit tests in MTR.Bjorn Munch2011-02-217-6/+95
| * | | | | | | | | null upmergeBjorn Munch2011-02-090-0/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | merge from 5.1Bjorn Munch2011-02-0969-385/+1120
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ merge from 5.5Bjorn Munch2011-02-0984-452/+1225
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ merge from mysql5.1 for bug#11760210Mayank Prasad2011-03-114-1/+34
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
| * | | | | | | | | | | BUG #11760210: 52596: SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LI...Mayank Prasad2011-03-114-1/+34
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Test cleanupMarc Alff2011-03-112-4/+32
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Reworked the test case to be more robust.Marc Alff2011-03-102-67/+173
* | | | | | | | | | Local mergeMarc Alff2011-03-105-5/+78
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Patch for Bug#11765684 (58674: SP-cache does not detect changes inAlexander Nozdrin2011-03-105-5/+78
* | | | | | | | | | | Local mergeMarc Alff2011-03-1086-370/+1548
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Skip tests in disabled-daily.listAnitha Gopi2011-03-101-13/+13
| * | | | | | | | | | Skip the tests listed in disabled-weekly.listAnitha Gopi2011-03-101-7/+7
| * | | | | | | | | | Bug11817185# : Disabled MAIN.ARCHIVE-BIG.TESTAnitha Gopi2011-03-101-0/+1
| * | | | | | | | | | mergeMattias Jonsson2011-03-093-0/+82
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge of Bug#11766232 - bug#59297Mattias Jonsson2011-03-093-0/+82
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug#59297: Can't find record in 'tablename' on update inner joinMattias Jonsson2011-01-243-0/+82
| * | | | | | | | | | | merge mysql-5.1->mysql-5.5Georgi Kodinov2011-03-097-56/+454
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | | | | | / / | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| | * | | | | | | | | merge mysql-5.0->mysql-5.1Georgi Kodinov2011-03-090-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ merge mysql-5.0-secrutiy-fixed -> mysql-5.0Georgi Kodinov2011-03-096-54/+452
| | | |\ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ Merge from mysql-5.1.56-releaseunknown2011-03-037-56/+452
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | | * | | | | | | | | | null weave merge mysql-5.0-security->mysql-5.1-securityGeorgi Kodinov2011-02-100-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | merge 5.0->5.0-securityGeorgi Kodinov2011-02-102-4/+5
| | | | |\ \ \ \ \ \ \ \ \
View Lorry Controller Status