summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* AUtomatic merge, no conflicts, no modifications of filesMatthias Leich2009-03-300-0/+0
|\
| * merge of fix for bug 43383 into actual treeMatthias Leich2009-03-304-30/+61
| |\
| * \ Merge from 5.0-bugteamStaale Smedseng2009-03-275-14/+54
| |\ \
* | \ \ Merge of fix for bug 43383 into actual treeMatthias Leich2009-03-303-27/+65
|\ \ \ \
| | \ \ \
| | \ \ \
| *-. \ \ \ Merge 5.0 -> 5.1 of fix for bug 43383Matthias Leich2009-03-303-27/+65
| |\ \ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Fix for Bug#43383 main.variables-big : Weak testing code and resultMatthias Leich2009-03-264-30/+61
| | * | | | Fix for Bug#43383 main.variables-big : Weak testing code and resultMatthias Leich2009-03-254-30/+61
| | |/ / /
* | | | | AutomergeKristofer Pettersson2009-03-303-10/+324
|\ \ \ \ \
| * | | | | Bug#40127 Multiple table DELETE IGNORE hangs on foreign key constraint violationKristofer Pettersson2009-03-273-10/+324
* | | | | | Merge from 5.1-bugteamStaale Smedseng2009-03-275-14/+54
|\ \ \ \ \ \
| * \ \ \ \ \ Automerge.Alexey Kopytov2009-03-270-0/+0
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Automerge.Alexey Kopytov2009-03-275-14/+54
| | |\ \ \ \ \
| * | \ \ \ \ \ Automerge.Alexey Kopytov2009-03-275-14/+54
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Manual merge.Alexey Kopytov2009-03-275-14/+54
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Fix for bug #43432: Union on floats does unnecessary rounding Alexey Kopytov2009-03-275-14/+54
* | | | | | | | | Merge from 5.0-bugteamStaale Smedseng2009-03-273-26/+87
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Bug#39953 Triggers are not working properly with multi tableStaale Smedseng2009-03-273-26/+91
| | |_|/ / / / | |/| | | | |
* | | | | | | MergeRamil Kalimullin2009-03-273-3/+83
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix for bug #26288: savepoint not deleted, comit on empty transactionRamil Kalimullin2009-03-273-3/+66
* | | | | | | MergeLeonard Zhou2009-03-270-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MergeLeonard Zhou2009-03-27196-2239/+3586
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge 5.0 to 5.1Leonard Zhou2009-03-275-1/+87
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | BUG#35515 Aliases of variables in binary log are ignored with NAME_CONST.Leonard Zhou2009-03-265-1/+87
* | | | | | | | Bug#33899: Deadlock in mysql_real_query with shared memory connectionsDavi Arnaut2009-03-263-7/+41
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Bug#33899: Deadlock in mysql_real_query with shared memory connectionsDavi Arnaut2009-03-263-7/+39
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | MergeLeonard Zhou2009-03-2690-664/+1131
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ auto-mergeIgnacio Galarza2009-03-251-3/+0
| |\ \ \ \ \ \ \
| | * | | | | | | Correct failing archive test.Ignacio Galarza2009-03-251-3/+0
| |/ / / / / / /
| * | | | | | | Disable query_cache_28249 due to Bug#43861.Alexander Nozdrin2009-03-251-0/+2
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | AutomergeAlexey Kopytov2009-03-251-5/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Automerge.Alexey Kopytov2009-03-252-2/+33
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge wide-char curses test and bugteam trunk.Chad MILLER2009-03-25143-1269/+2071
| | |\ \ \ \ \ \
| | * | | | | | | Accept wide-character version of libncurses also.Chad MILLER2009-03-111-5/+8
| * | | | | | | | AutomergeAlexey Kopytov2009-03-252-3/+34
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Manual merge.Alexey Kopytov2009-03-252-3/+34
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | | * | | | | | | Fix for bug #42965: isinf() on 32bit x86 with gcc 4.3 can Alexey Kopytov2009-03-242-2/+33
| * | | | | | | | | merge to latest 5.1-bugteamSatya B2009-03-250-0/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ MergeLeonard Zhou2009-03-251-0/+2
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Empty merge for fixing only in 5.0Leonard Zhou2009-03-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ merge 5.0-bugteam to 5.1-bugteamSatya B2009-03-253-0/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | / / / / / | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | merge to 5.0-bugteamSatya B2009-03-2514-49/+549
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Fix the test case error in PB.Leonard Zhou2009-03-252-0/+2
| | * | | | | | | | | | Fix for BUG#41541 - Valgrind warnings on packed MyISAM tableSatya B2009-03-253-0/+56
| * | | | | | | | | | | Disabled embedded server in the test case for bug #41486.Alexey Kopytov2009-03-251-0/+2
| | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Fix for bug #43801: mysql.test takes too long, fails due to Alexey Kopytov2009-03-252-0/+6
| * | | | | | | | | | Fix test case erro in sles10-ia64-a. Leonard Zhou2009-03-252-0/+2
| * | | | | | | | | | Automerge.Alexey Kopytov2009-03-240-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Automerge.Alexey Kopytov2009-03-245-42/+76
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2009-03-244-42/+55
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Manuel merge.Alexey Kopytov2009-03-244-42/+55
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |