summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge 5.1 up into 5.4-build ("trunk").Joerg Bruehe2009-08-291-1/+34
|\
| * Apply changes from mysql-5.1.38-release clone:Jonathan Perkin2009-08-241-1/+40
| * Upmerge a merge changeset from 5.0 to 5.1, no code change involved.Joerg Bruehe2009-08-210-0/+0
| |\
| | * Merge the correction for the bug#37098 fix into 5.0-buildJoerg Bruehe2009-08-201-2/+2
| | |\
| * | \ automerge the correction for bug#37098 into 5.1-buildJoerg Bruehe2009-08-201-1/+1
| |\ \ \
| * \ \ \ Upmerge 5.0-build into 5.1-buildJoerg Bruehe2009-08-130-0/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge main 5.0 with 5.0-build,Joerg Bruehe2009-08-110-0/+0
| | |\ \ \
| | * | | | Correct a merge error that happened during a backport for 5.0.82sp1:Joerg Bruehe2009-08-112-143/+0
| * | | | | Merge main 5.1 into 5.1-buildJoerg Bruehe2009-08-135-3/+5
| |\ \ \ \ \
* | \ \ \ \ \ Merge from mysql-trunk.Alexander Nozdrin2009-08-274-4/+8
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge from mysql-trunk-build.Alexander Nozdrin2009-08-273-2/+3
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Automerge "trunk" (5.4.2 cloning + version number increase to 5.4.3)Joerg Bruehe2009-08-272-1/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | Raise version number after cloning 5.4.2-betaunknown2009-08-261-1/+1
| | | * | | | | | | Applying fix from Oracle (Marko) for Bug #46657 "InnoDB plugin: invalid read ...Guilhem Bichot2009-08-251-0/+1
| | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Automerge "trunk" -> "trunk-build".Joerg Bruehe2009-08-241-2/+5
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Backporting patch for Bug#46650 (Innodb assertion autoinc_lock == lockAlexander Nozdrin2009-08-241-2/+5
| | * | | | | | | Merge the correction to the bug#37098 fix from 5.1 to 5.4.Joerg Bruehe2009-08-201-1/+1
| | |\ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | _ / | | | | | | | /
| | * | | | | | Merge the correction to the bug#37098 fix from 5.0 to 5.1.Joerg Bruehe2009-08-201-1/+1
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | / | | | | |_|_|/ | | | |/| | |
| | | * | | | Get rid of manual pages which aren't used.Joerg Bruehe2009-08-201-2/+2
| * | | | | | Fix default.confAlexander Nozdrin2009-08-191-1/+1
* | | | | | | Fix default.confAlexander Nozdrin2009-08-261-1/+1
* | | | | | | Merge from mysql-5.1-bugteamAlexander Nozdrin2009-08-2662-285/+1436
|\ \ \ \ \ \ \
| * | | | | | | Bug#45261: Crash, stored procedure + decimalDavi Arnaut2009-08-2412-110/+483
| * | | | | | | auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2009-08-241-3/+0
| |\ \ \ \ \ \ \
| | * | | | | | | BUG#45694 Deadlock in replicated statement is not retriedAlfranio Correia2009-08-191-3/+0
| * | | | | | | | auto-merge mysql-5.1-bugteam (local) --> mysql-5.1-bugteamAlfranio Correia2009-08-243-10/+20
| |\ \ \ \ \ \ \ \
| | * | | | | | | | BUG#46130 Slave does not correctly handle "expected errors"Alfranio Correia2009-08-133-10/+20
| * | | | | | | | | mergeMattias Jonsson2009-08-214-35/+44
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug#46639: 1030 (HY000): Got error 124 from storage engine onMattias Jonsson2009-08-214-35/+44
| * | | | | | | | | | reverted the fix for bug #46019 from 5.1-bugteamGeorgi Kodinov2009-08-215-77/+3
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ automergeGeorgi Kodinov2009-08-213-0/+31
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge.Martin Hansson2009-08-213-0/+31
| | | |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Revert of the fix for bug #46019.Georgi Kodinov2009-08-214-91/+4
| | |/ / / / / / / / / / /
| * | | | | | | | | | | | Merge.Martin Hansson2009-08-213-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Bug#46616: MergeMartin Hansson2009-08-203-0/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Bug#46616: Assertion `!table->auto_increment_field_not_null' on Martin Hansson2009-08-203-0/+31
| * | | | | | | | | | | | | Fix for bug #46456 [Ver->Prg]: HANDLER OPEN + TRUNCATE + DROPRamil Kalimullin2009-08-213-0/+39
| * | | | | | | | | | | | | merge of bug #46019 to 5.1-bugteamGeorgi Kodinov2009-08-205-3/+77
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Bug #46019: ERROR 1356 When selecting from within anotherGeorgi Kodinov2009-08-194-4/+91
| * | | | | | | | | | | | | Bug #45962: memory leak after 'sort aborted' errorsGeorgi Kodinov2009-07-091-1/+10
| * | | | | | | | | | | | | null merge of the backport of Chad's fix for bug #39326 to 5.1-bugteamGeorgi Kodinov2009-08-190-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | / / / / / / / / / | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | backport of Chad's fix for bug #39326 to 5.0-bugteamGeorgi Kodinov2009-08-191-5/+19
| * | | | | | | | | | | | automereGeorgi Kodinov2009-08-170-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | automergeGeorgi Kodinov2009-08-170-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | / | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| | | * | | | | | | | | Merge from mysql-5.0-bugteam.Davi Arnaut2009-08-111-45/+45
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ | | | |/| | | | | | | |
| * | | | | | | | | | | automergeGeorgi Kodinov2009-08-17455-339/+221194
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | * | | | | | | | | Ignore auto-generated file: libmysqld/examples/mysqltest.ccAlexander Nozdrin2009-08-121-0/+1
| | * | | | | | | | | Fix 5.1 build error.Alexander Nozdrin2009-08-122-2/+2
| | * | | | | | | | | Raise version number after cloning 5.1.38unknown2009-08-121-1/+1
| | * | | | | | | | | Disable main.index_merge_innodb with InnoDB plugin. The test case isSergey Vojtovich2009-08-121-0/+1
View Lorry Controller Status