summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* auto-mergeTatiana A. Nurnberg2009-10-2010-68/+258
|\
| * A post fix for BUG#45645 Mysql server close all connection and restart using ...Alexander Barkov2009-10-201-1/+2
| * AutomergeKristofer Pettersson2009-10-209-52/+137
| |\
| | * merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-10-200-0/+0
| | |\
| | | * merge to mysql-5.0-bugteamSatya B2009-10-203-3/+7
| | | |\
| | * | \ merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-10-203-12/+107
| | |\ \ \ | | | |/ /
| | | * | Fix for Bug #41597 - After rename of user, there are additional grants when Satya B2009-10-203-12/+107
| | * | | Merge 5.1-bugteam -> 5.1-bugteam-local.Sergey Vojtovich2009-10-201-7/+5
| | |\ \ \
| | | * | | Bug #34777 mysqlbinlog: --help output for --base64-output is hard to unders...unknown2009-10-201-7/+5
| | * | | | Merge 5.1-bugteam -> 5.1-bugteam-local.Sergey Vojtovich2009-10-202-33/+7
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | BUG#47455 - The myisam_crash_before_flush_keys test fails on WindowsSergey Vojtovich2009-10-142-33/+7
| * | | | | automergeKristofer Pettersson2009-10-203-15/+137
| |\ \ \ \ \
| | * | | | | Bug#47627 SET @@{global.session}.local_variable in stored routine causes crashKristofer Pettersson2009-10-193-15/+137
* | | | | | | manual merge of 28141Tatiana A. Nurnberg2009-10-207-22/+39
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Bug#28141: Control C on query waiting on lock causes ERROR 1053 (server shutd...Tatiana A. Nurnberg2009-10-197-19/+38
| | |_|_|_|/ | |/| | | |
* | | | | | Bug#45645 Mysql server close all connection and restart using lower functionAlexander Barkov2009-10-193-0/+18
| |/ / / / |/| | | |
* | | | | AutomergeKristofer Pettersson2009-10-193-2/+49
|\ \ \ \ \
| * | | | | Bug#43207 wrong LC_TIME names for romanian localeAlexander Barkov2009-10-192-0/+47
| * | | | | Bug#43207 wrong LC_TIME names for romanian localeAlexander Barkov2009-10-191-2/+2
* | | | | | AutomergeKristofer Pettersson2009-10-191-1/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Bug#46944 Internal prepared XA transction XIDs are notKristofer Pettersson2009-10-121-1/+0
* | | | | | Fix for bug#47963: Wrong results when index is usedRamil Kalimullin2009-10-183-7/+98
|\ \ \ \ \ \
| * | | | | | Fix for bug#47963: Wrong results when index is usedRamil Kalimullin2009-10-133-7/+98
* | | | | | | Bug #47123: Endless 100% CPU loop with STRAIGHT_JOIN Alexey Kopytov2009-10-175-4/+33
* | | | | | | Merge merge changesets from main 5.1 into 5.1-bugteam.Joerg Bruehe2009-10-160-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Upmerge merge changesets.Joerg Bruehe2009-10-160-0/+0
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | 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
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Upmerge a merge changeset.Joerg Bruehe2009-10-160-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge 5.0-bugteam (compile fix) into main 5.0Joerg Bruehe2009-10-161-0/+4
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ mergeGeorgi Kodinov2009-10-164-3/+46
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Upmerge a Windows compile fix from 5.0 to 5.1.Joerg Bruehe2009-10-161-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge the Windows compile fix into the push tree.Joerg Bruehe2009-10-161-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Compile fix for Windows:Joerg Bruehe2009-10-161-1/+1
| * | | | | | | | | | | Bug#46019: ERROR 1356 When selecting from within anotherMartin Hansson2009-10-163-2/+45
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-1632-155/+185
|/ / / / / / / / / /
* | | | | | | | | | 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