summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-19185-2727/+5335
|\
| * Merge from mysql-5.1.Alexander Nozdrin2009-10-195-15/+17
| |\
| | * Upmerge merge changesets.Joerg Bruehe2009-10-160-0/+0
| | |\
| | | * Merge 5.0-bugteam (compile fix) into main 5.0Joerg Bruehe2009-10-161-0/+4
| | | |\
| | | | * Merge the Windows compile fix into the push tree.Joerg Bruehe2009-10-161-1/+1
| | | | |\
| | * | | \ Merge a compile fix.Joerg Bruehe2009-10-162-2/+2
| | |\ \ \ \
| | | * \ \ \ Upmerge the Windows compile fix from 5.0 to 5.1Joerg Bruehe2009-10-161-1/+1
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Compile fix for Windows:Joerg Bruehe2009-10-161-1/+1
| | * | | | | Upmerge a merge changeset - no contents change.Joerg Bruehe2009-10-160-0/+0
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge bug fix into push tree.Joerg Bruehe2009-10-151-0/+4
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | * | | | | mergeGeorgi Kodinov2009-10-163-31/+0
| | |\ \ \ \ \
| | | * | | | | Revert the fix for bug #47123 until test suite failures are resolved.Georgi Kodinov2009-10-163-31/+0
| | | * | | | | version changeGeorgi Kodinov2009-10-151-1/+1
| | * | | | | | Merge the bug fixes into the push tree.Joerg Bruehe2009-10-152-4/+9
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | / / | | | | |_|/ / | | | |/| | |
| | | * | | | Fix Bug #47957Joerg Bruehe2009-10-091-4/+5
| | | * | | | Upmerge (automerge) into 5.1Joerg Bruehe2009-10-091-0/+4
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Fix bug#47923 New "mf_keycache.c" requires thread supportJoerg Bruehe2009-10-081-0/+4
| | * | | | | mergeGeorgi Kodinov2009-10-150-0/+0
| | |\ \ \ \ \
| | | * | | | | Marked all the NDB related tests experimental as agreed with Bernard Ocklin.Georgi Kodinov2009-10-151-5/+37
| | * | | | | | All NDB tests made experimental after a discussion with Bernhard Ocklin.Georgi Kodinov2009-10-151-5/+37
| | |/ / / / /
| | * | | | | Manual merge.Alexey Kopytov2009-10-153-0/+31
| | |\ \ \ \ \
| | | * | | | | Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN Alexey Kopytov2009-10-133-0/+30
| | * | | | | | Disabled part of test for BUG#47073 until additional fix is pushed.Sergey Vojtovich2009-10-152-11/+7
| * | | | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-191-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | mergeJorgen Loland2009-10-143-12/+26
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ mergeGeorgi Kodinov2009-10-1416-164/+393
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ mergeGeorgi Kodinov2009-10-141-1/+1
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | | * | | | | | version changeGeorgi Kodinov2009-10-141-1/+1
| | | | | |_|_|_|/ | | | | |/| | | |
| | | * | | | | | mergeGeorgi Kodinov2009-10-141-1/+1
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | merged main to mysql-5.0-bugteamGeorgi Kodinov2009-10-142-3/+3
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Null-merge from mysql-5.0.84sp1-releaseunknown2009-10-140-0/+0
| | | | | |\ \ \ \ \
| | | | | | * | | | | Backport into build-200909301147-5.0.84sp1MySQL Build Team2009-09-301-1/+1
| | | | | | * | | | | Backport into build-200909301147-5.0.84sp1MySQL Build Team2009-09-305-6/+20
| | | | | | * | | | | Backport into build-200909301147-5.0.84sp1MySQL Build Team2009-09-303-12/+88
| | | | | | * | | | | Set version number for mysql-5.0.84sp1 releaseunknown2009-09-301-1/+1
| | | | | * | | | | | Raise version number after cloning 5.0.87unknown2009-10-131-2/+2
| | | | * | | | | | | "MySQL Network" => "MySQL Enterprise"Kent Boortz2009-10-081-1/+1
| | | | | |_|_|_|_|/ | | | | |/| | | | |
| | | * | | | | | | merged 5.1-mainGeorgi Kodinov2009-10-143-12/+26
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Null-merge from mysql-5.1.37sp1-releaseunknown2009-10-130-0/+0
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Add fixes for Bug#46834: Test suite missing from RPMsMySQL Build Team2009-10-055-4/+12
| | | | | * | | | | | | Backport into build-200909221805-5.1.37sp1MySQL Build Team2009-09-223-12/+89
| | | | | * | | | | | | Backport into build-200909221805-5.1.37sp1MySQL Build Team2009-09-225-6/+20
| | | | | * | | | | | | Backport into build-200909221805-5.1.37sp1MySQL Build Team2009-09-223-0/+39
| | | | | * | | | | | | Backport into build-200909221805-5.1.37sp1MySQL Build Team2009-09-223-2/+23
| | | | | * | | | | | | Backport into build-200909221805-5.1.37sp1MySQL Build Team2009-09-224-13/+118
| | | | | * | | | | | | Backport into build-200909221805-5.1.37sp1MySQL Build Team2009-09-221-1/+1
| | | | | * | | | | | | Backport into build-200909221805-5.1.37sp1MySQL Build Team2009-09-226-55/+171
| | | | | * | | | | | | Backport into build-200909221805-5.1.37sp1MySQL Build Team2009-09-222-18/+77
| | | | | * | | | | | | Backport into build-200909221805-5.1.37sp1MySQL Build Team2009-09-221-0/+11
| | | | | * | | | | | | Backport into build-200909221805-5.1.37sp1MySQL Build Team2009-09-223-1/+24