summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-5.5-merge.clone-5.5.6-m3-buildAlexander Nozdrin2010-08-2521-15/+209
|\
| * 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-securitymysql-5.1.50clone-5.1.50-buildAlfranio 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
| | | | | |\ \ \ \ \
| | | | * | \ \ \ \ \ mergeGeorgi Kodinov2010-07-21179-1732/+2057
| | | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ mergeGeorgi Kodinov2010-07-211-0/+1
| | | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | | Raise the version number, 5.1.50 is (was) being built in a parellel tree.MySQL Build Team2010-08-191-1/+1
| | | | |/ / / / / / / / | | | |/| | | | | | | |
| * | | | | | | | | | | mergeMattias Jonsson2010-08-197-1/+53
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | mergeMattias Jonsson2010-08-197-1/+53
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug#46086: crash when dropping a partitioned tableMattias Jonsson2010-07-087-1/+53
| * | | | | | | | | | | | The patch is 5.1 part of the worklog. It is for 5.1 only. unknown2010-08-180-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | WL#5370 Keep forward-compatibility when changingunknown2010-08-1815-27/+1191
| * | | | | | | | | | | | mergeGeorgi Kodinov2010-08-174-10/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Bug #55580 : segfault in read_view_sees_trx_idGeorgi Kodinov2010-08-135-10/+99
| * | | | | | | | | | | | mergeGeorgi Kodinov2010-08-162-0/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | Bug #55565: debug assertion when ordering by expressions with user Georgi Kodinov2010-08-134-1/+22
* | | | | | | | | | | | | Auto-merge from mysql-5.5-bugfixing.Alexander Nozdrin2010-08-25351-5971/+22163
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Revert patch for Bug#56120 temporarily.Alexander Nozdrin2010-08-253-28/+4
| * | | | | | | | | | | | | Auto-merged.Evgeny Potemkin2010-08-2420-137/+685
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fixed --ps-protocol failures of test for bug#54332 "DeadlockDmitry Lenev2010-08-242-0/+7
| | * | | | | | | | | | | | | Follow-up to Bug #54332 Deadlock with two connections doingJon Olav Hauglid2010-08-241-33/+55
| | * | | | | | | | | | | | | merge mysql-5.5-bugfixing (local) --> mysql-5.5-bugfixingAlfranio Correia2010-08-243-72/+73
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Post-fix push for BUG#53452.Alfranio Correia2010-08-233-72/+73
| | * | | | | | | | | | | | | | mysqlhotcopy tests fixed.Alexey Botchkov2010-08-232-2/+5
| | * | | | | | | | | | | | | | After fix for Bug#55912 FORMAT with locale set fails for numbers < 1000Alexander Barkov2010-08-241-1/+1
| | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Bug #54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYEDJon Olav Hauglid2010-08-233-10/+297
| | * | | | | | | | | | | | | mergeChristopher Powers2010-08-236-16/+117
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Bug#52121 partition by key on utf32 enum field cause debug assertion: (length...Alexander Barkov2010-08-233-1/+43
| | | * | | | | | | | | | | | | Merge fix for BUG#54989 to mysql-5.5-bugfixing.Sergey Vojtovich2010-08-233-15/+74
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | BUG#54989 - With null_audit installed, server hangs on anSergey Vojtovich2010-08-203-15/+74
| | * | | | | | | | | | | | | | | mergeChristopher Powers2010-08-225-31/+156
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Bug#54747: Deadlock between REORGANIZE PARTITION and SELECT is not detectedMattias Jonsson2010-08-205-31/+156
| | * | | | | | | | | | | | | | | Bug #55345, "mysql_library_init causes segfault if executed after calling mys...Christopher Powers2010-08-221-0/+2
| | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Bug#56120: Failed assertion on MIX/MAX on negative time valueEvgeny Potemkin2010-08-233-4/+28
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | mergeChristopher Powers2010-08-20196-2670/+8120
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Bug#54129 Missing the execute bit for scriptsAlexey Botchkov2010-08-193-2/+2
View Lorry Controller Status