summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Fixed the failing tests. Addendum to the fix for bug #22504.Georgi Kodinov2009-03-201-15/+15
* | fixed compilation warnings. addendum to the fix for bug 29125Georgi Kodinov2009-03-207-12/+10
* | Fixed a prototype to match the actual function signature (addendum to theGeorgi Kodinov2009-03-201-1/+1
* | reverting a bogus fix into 5.1-bugteamGeorgi Kodinov2009-03-202-11/+9
* | Merge contributed automake changes, and 5.1 upstream.Chad MILLER2009-03-19105-283/+1056
|\ \
| * \ MergeSergey Petrunia2009-03-1996-259/+283
| |\ \
| | * \ auto-mergeIgnacio Galarza2009-03-1942-116/+672
| | |\ \
| | | * \ Bug#43329 merge from 5.1 GCA branchBernt M. Johnsen2009-03-192-18/+41
| | | |\ \
| | | | * \ Bug#43329 Prepared for push on 5.1Bernt M. Johnsen2009-03-192-18/+41
| | | | |\ \
| | | | | * | Bug#43329 prepared for commit on 5.0Bernt M. Johnsen2009-03-182-18/+41
| | * | | | | auto-mergeIgnacio Galarza2009-03-1935-198/+365
| | |\ \ \ \ \
| | * \ \ \ \ \ auto-mergeIgnacio Galarza2009-03-17426-5534/+27120
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-1394-240/+241
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-10108-751/+786
| | | | |_|_|_|_|/ | | | |/| | | | |
| * | | | | | | | Merge @@optimizer_switch no_xxx -> xxx=off change to 6.0Sergey Petrunia2009-03-1919-73/+350
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | MergeSergey Petrunia2009-03-1810-10/+17
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ MergeSergey Petrunia2009-03-1827-106/+399
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix wrong parameter name which caused compile failure on windowsSergey Petrunia2009-03-161-1/+1
| * | | | | | | | | | MergeSergey Petrunia2009-03-1613-50/+170
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | @@optimizer_switch switch from no_xxx to xxx={on|off} syntax:Sergey Petrunia2009-03-161-1/+1
| * | | | | | | | | | | Merge Sergey Petrunia2009-03-1426-113/+596
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | @@optimizer_switch backport and change from no_xxx to xx=on|off: post-review ...Sergey Petrunia2009-03-147-59/+136
| * | | | | | | | | | | | MergeSergey Petrunia2009-03-11110-1477/+19832
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Change optimizer_switch from no_xxx to xxx=on/xx=off.Sergey Petrunia2009-03-118-78/+388
| * | | | | | | | | | | | | Post-merge fixesSergey Petrunia2009-03-101-1/+4
| * | | | | | | | | | | | | MergeSergey Petrunia2009-03-10243-2172/+4890
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | - Backport @@optimizer_switch support from 6.0Sergey Petrunia2009-02-239-23/+382
* | | | | | | | | | | | | | | Merge bugteam and contributed two patches from Chad MILLER2009-03-192-9/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Copy include/config.h to include/my_config.h at configure-time. Also,Chad MILLER2009-03-192-5/+4
| * | | | | | | | | | | | | | Using autoconf definitions instead of manually appending to CFLAGS is Chad MILLER2009-03-181-4/+7
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | due to merge.Horst Hunger2009-03-191-25/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge from 5.0-bugteamStaale Smedseng2009-03-191-25/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | Bug #42502 huge memory leak possible with timezone Staale Smedseng2009-03-191-25/+52
* | | | | | | | | | | | | | | | Reviewed patch for Bug#39862.Horst Hunger2009-03-191-1/+7
|/ / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | Automerge.Alexey Kopytov2009-03-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Automerge.Alexey Kopytov2009-03-192-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2009-03-192-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2009-03-192-6/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Fixed test failures in 5.1/6.0 introduced by the patchAlexey Kopytov2009-03-192-6/+10
* | | | | | | | | | | | | | | | | 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-03-194-2/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | automergeSergey Glukhov2009-03-193-1/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Bug#41268 Help Text for \c is misleading in client command line interfaceSergey Glukhov2009-03-191-1/+1
| * | | | | | | | | | | | | | | | | Bug#41627 Illegal mix of collations in LEAST / GREATEST / CASESergey Glukhov2009-03-193-1/+51
* | | | | | | | | | | | | | | | | | Merge 5.0-bugteam to 5.1-bugteamSatya B2009-03-193-1/+44
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | merge to 5.0-bugteamSatya B2009-03-196-24/+89
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Fix for BUG#21360 - mysqldump error on federated tablesSatya B2009-03-193-1/+44
* | | | | | | | | | | | | | | | | | MergeLeonard Zhou2009-03-16365-3772/+25326
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2009-03-194-19/+46
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status