summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* merge 5.1-security->5.5-securityGeorgi Kodinov2011-03-170-0/+0
|\
| * merge 5.1->5.1-securityGeorgi Kodinov2011-03-1787-29/+417
| |\
* | \ merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-17167-186/+1501
|\ \ \
| * \ \ Fix for BUG#11868903 (BUG#59717).Luis Soares2011-03-162-2/+5
| |\ \ \ | | | |/ | | |/|
| | * | Fix for BUG#11868903 (BUG#59717)Luis Soares2011-03-162-2/+5
| * | | Merge from mysql-5.5.10-releasehery.ramilison@oracle.com2011-03-1632-79/+259
| |\ \ \
| | * | | The client shared library major version was changed to 18, to reflectKent Boortz2011-02-171-1/+1
| | * | | Merge README update into the 5.5.10 release clone.Jonathan Perkin2011-02-171-6/+15
| | * | | Revert 59685, as we now cache datetimes correctly.Tor Didriksen2011-02-172-4/+3
| | * | | Bug #11766860 - 60085: CRASH IN ITEM::SAVE_IN_FIELD() WITH TIME DATA TYPETor Didriksen2011-02-176-13/+62
| | * | | Bug #59686 crash in String::copy() with time data typeTor Didriksen2011-02-113-4/+36
| | * | | Fix for BUG#59894Guilhem Bichot2011-02-1120-62/+136
| * | | | bug#58525 postfixSerge Kozlov2011-03-161-1/+1
| * | | | BUG#11872422: rpl_slave_load_remove_tmpfile fails sporadically in pb2Sven Sandberg2011-03-153-12/+25
| * | | | Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denialDmitry Shulga2011-03-1512-11/+161
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS".Dmitry Shulga2011-03-158-14/+146
| * | | | Bug #11765416 (former 58381)Jon Olav Hauglid2011-03-153-8/+108
| * | | | Add warning suppression to test rpl.rpl_slave_load_remove_tmpfileBjorn Munch2011-03-152-0/+2
| * | | | Local merger for BUG#59752Chuck Bell2011-03-149-5/+69
| |\ \ \ \
| | * \ \ \ 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
| * | | | | BUG#59752 : mysql.user.plugin length (60) vs. mysql.plugin.name length (64)Chuck Bell2011-03-114-6/+6
| |/ / / /
| * | | | 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
| | | |\ \ \ \ \ \ \ \ \ \