summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Small fixes in CMake: Vladislav Vaintroub2010-09-032-5/+8
* Bug#55873 short startup options do not work in 5.5Marc Alff2010-09-011-1/+1
* merging.Alexey Botchkov2010-09-011-14/+10
|\
| * Bug#54906 Inconsistent license of libmysqldAlexey Botchkov2010-09-011-14/+10
* | Auto-merge from mysql-5.5.Alexander Nozdrin2010-09-0174-265/+1195
|\ \ | |/ |/|
| * Auto-merge from mysql-5.5-stage.Alexander Nozdrin2010-09-0155-249/+985
| |\
| | * Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-315-38/+39
| | |\
| | | * automerge 5.1-bugteam --> 5.5-merge (bug 53034)Gleb Shchepa2010-08-313-1/+39
| | | |\
| | | | * Bug #53034: Multiple-table DELETE statements not acceptingGleb Shchepa2010-08-313-1/+39
| | | * | Follow-up for Bug#29751: FLUSH LOGS doesn't create -old file,Dmitry Shulga2010-08-302-37/+0
| | * | | Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-30417-6228/+23621
| | |\ \ \ | | | |/ /
| | | * | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-30393-6115/+23121
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Auto-merge from mysql-5.5-bugfixing.Alexander Nozdrin2010-08-3067-162/+976
| |\ \ \ \
| * | | | | Raise version number after cloning 5.5.6-m3unknown2010-08-251-1/+1
| * | | | | Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-2521-15/+209
| |\ \ \ \ \
| * \ \ \ \ \ Auto-merge from mysql-5.5-bugfixing.Alexander Nozdrin2010-08-25351-5971/+22163
| |\ \ \ \ \ \
| | | | | | * | Disable 'plugin*' tests due to Bug 55966.Alexander Nozdrin2010-08-301-0/+3
| | | | | | * | Automerge.Alexey Kopytov2010-08-304-21/+25
| | | | | | |\ \
| | | | | | | * | Bug #54465: assert: field_types == 0 || field_types[field_pos]Alexey Kopytov2010-08-274-21/+25
| | | | | | * | | Merge 5.1-bugteam to 5.5-merge.Sergey Vojtovich2010-08-275-23/+134
| | | | | | |\ \ \ | | | | | | | | |/ | | | | | | | |/|
| | | | | | | * | Fix for bug #54253: memory leak when using I_S plugins w/o deinit methodRamil Kalimullin2010-08-271-5/+8
| | | | | | | * | Reduced #ifndef for 52301, caused compile warningBjorn Munch2010-08-261-4/+0
| | | | | | | |/
| | | | | | | * Automerge.Alexey Kopytov2010-08-266-72/+218
| | | | | | | |\
| | | | | | | | * Fixed race condition in a test case for BUG#55580.Sergey Vojtovich2010-08-261-0/+5
| | | | | | | | * Bug #55656: mysqldump can be slower after bug 39653 fix.Evgeny Potemkin2010-08-263-18/+125
| | | | | | | | * merge followup fix for 52301Bjorn Munch2010-08-251-0/+6
| | | | | | | | |\
| | | | | | | | | * Cherry pick 55501Bjorn Munch2010-08-251-0/+1
| | | | | | | | | * Bug #52301 Add --protocol to mysqltestBjorn Munch2010-08-251-0/+6
| | | | | | * | | | Enable plugin tests (Bug 55966) to check if they still fail.Alexander Nozdrin2010-08-261-3/+0
| | | | | | * | | | Automerge.Alexey Kopytov2010-08-263-0/+29
| | | | | | |\ \ \ \ | | | | | | | |/ / /
| | | | | | | * | | Bug #54802: 'NOT BETWEEN' evaluation is incorrectAlexey Kopytov2010-08-243-0/+29
| | | | | | * | | | Auto-merge from mysql-5.1-bugteamDmitry Shulga2010-08-252-54/+82
| | | | | | |\ \ \ \ | | | | |_|/ / / / / | | | |/| | | | / / | | | | | | | |/ / | | | | | | |/| |
| | | | | | * | | Fixed bug #29751 - do not rename the error log at FLUSH LOGS.Dmitry Shulga2010-08-252-54/+82
| | | | | | |/ /
| | | * | | | | mergeMattias Jonsson2010-08-201-0/+1
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | post push test fixMattias Jonsson2010-08-201-0/+1
| | | * | | | | mergeGeorgi Kodinov2010-08-209-4/+93
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | mergeGeorgi Kodinov2010-08-200-0/+0
| | | | |\ \ \ \
| | | | | * \ \ \ mergeGeorgi Kodinov2010-08-200-0/+0
| | | | | |\ \ \ \
| | | | | | * | | | tree name updateGeorgi Kodinov2010-08-021-3/+3
| | | | * | | | | | mergeGeorgi Kodinov2010-08-2016-7/+212
| | | | |\ \ \ \ \ \
| | | | | * \ \ \ \ \ Merge from mysql-5.1.50-releaseunknown2010-08-19252-2436/+3535
| | | | | |\ \ \ \ \ \
| | | | | | * \ \ \ \ \ auto-merge mysql-5.1-security (local) --> mysql-5.1-securityAlfranio Correia2010-08-035-2/+102
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | BUG#55625 RBR breaks on failing 'CREATE TABLE'Alfranio Correia2010-08-025-2/+102
| | | | | | * | | | | | | mergeGeorgi Kodinov2010-08-020-0/+0
| | | | | | |\ \ \ \ \ \ \ | | | | | | | | |_|/ / / / | | | | | | | |/| | | | |
| | | | | | | * | | | | | mergeGeorgi Kodinov2010-08-021-2/+2
| | | | | | | |\ \ \ \ \ \
| | | | | | * | \ \ \ \ \ \ merge mysql-5.1-bugteam into mysql-5.1-securityGeorgi Kodinov2010-08-0269-698/+1267
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | Bug #54461: crash with longblob and union or update with subqueryGleb Shchepa2010-08-013-0/+29
| | | | | | * | | | | | | | | Bug #54476: crash when group_concat and 'with rollup' inAlexey Kopytov2010-07-234-4/+53
| | | | | | * | | | | | | | | mergeGeorgi Kodinov2010-07-210-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / | | | | | | | |/| | | | | | |
| | | | | | | * | | | | | | | mergeGeorgi Kodinov2010-07-212-10/+26
| | | | | | | |\ \ \ \ \ \ \ \