summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Build fixes for Windows, AIX, HP/UX and Sun Studio11, from Timothy Smith.Jonathan Perkin2009-08-144-11/+20
| * | | Apply build fixJonathan Perkin2009-08-123-2/+3
* | | | null merge of 5.0 fixes backported from 5.1Georgi Kodinov2009-09-020-0/+0
|\ \ \ \
| * | | | Backported the --parallel=str option from mtr2 for backward compatibilityGeorgi Kodinov2009-09-021-0/+3
| * | | | mergeGeorgi Kodinov2009-09-021-0/+2
| |\ \ \ \
| | * \ \ \ mergeGeorgi Kodinov2009-09-022-7/+11
| | |\ \ \ \ | | |/ / / / | |/| | | |
| | * | | | moved version to 5.0-mainGeorgi Kodinov2009-09-021-1/+1
* | | | | | fixed a valgrind warning in partition_pruningGeorgi Kodinov2009-09-021-0/+1
* | | | | | automergeGeorgi Kodinov2009-09-022-8/+16
|\ \ \ \ \ \
| * \ \ \ \ \ Manual merge.Davi Arnaut2009-09-021-7/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Post-merge fix. Observe C declaration placement rules.Davi Arnaut2009-09-021-7/+9
| | |/ / / /
| | * | | | auto-mergeTatiana A. Nurnberg2009-08-317-161/+97
| | |\ \ \ \
| * | | | | | Increase thread stack size on HP-UX when built with debug.Davi Arnaut2009-09-021-1/+6
* | | | | | | fixed a valgrind warning in partitioning codeGeorgi Kodinov2009-09-021-0/+1
|/ / / / / /
* | | | | | Fixed win32 compilation warningsGeorgi Kodinov2009-09-022-1/+3
* | | | | | fixed compilation warningsGeorgi Kodinov2009-09-021-6/+6
* | | | | | merge to update with latest mysql-5.1-bugteamMattias Jonsson2009-09-013-10/+10
|\ \ \ \ \ \
| * | | | | | Fixed a problem in how BUILD/check_cpu handles Core 2 Duo processors.Georgi Kodinov2009-09-011-4/+5
| * | | | | | Bug#45611: Minor code cleanupDavi Arnaut2009-09-012-6/+5
* | | | | | | post push fix for bug#20577 and bug#46362, disabling warningsMattias Jonsson2009-09-012-4/+14
* | | | | | | Post fix patch for bug#20577 and bug#46362.Mattias Jonsson2009-09-011-2/+3
|/ / / / / /
* | | | | | auto-mergeTatiana A. Nurnberg2009-08-3110-167/+143
|\ \ \ \ \ \
| * \ \ \ \ \ automergeGeorgi Kodinov2009-08-310-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | merge 5.0-main -> 5.0-bugteamGeorgi Kodinov2009-08-313-145/+2
| | |\ \ \ \ \
| * | \ \ \ \ \ automerge 5.1-main -> 5.1-bugteamGeorgi Kodinov2009-08-316-151/+47
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | 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
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ 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
| | * | | | | | | | 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
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Create separate vardirs during collections test runs.Daniel Fischer2009-08-122-6/+6
| * | | | | | | | | | automergeGeorgi Kodinov2009-08-313-12/+89
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Bug #46749: Segfault in add_key_fields() with outer subquery level Georgi Kodinov2009-08-273-12/+88
| * | | | | | | | | | merging bugfix from 5.0Anurag Shekhar2009-08-311-4/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | merging with changes in bugteam branch.Anurag Shekhar2009-08-3168-307/+527
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #44723 Larger read_buffer_size values can cause performance Anurag Shekhar2009-08-241-4/+7
* | | | | | | | | | | | manual mergeTatiana A. Nurnberg2009-08-312-32/+109
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | / / / | | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Bug#35132: MySQLadmin --wait ping always crashes on Windows systemsTatiana A. Nurnberg2009-08-312-29/+108
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Bug #44331 Restore of database with events produces warning in replicationunknown2009-08-312-8/+34
* | | | | | | | | | Merge from 5.1-bugteamStaale Smedseng2009-08-3014-13/+185
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2009-08-303-1/+38
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug #46607: Assertion failed: (cond_type == Item::FUNC_ITEM) Alexey Kopytov2009-08-303-1/+38
| * | | | | | | | | | | Bug #44331 Restore of database with events produces warning in replicationunknown2009-08-297-12/+131
| * | | | | | | | | | | Reduce test case runtime.Davi Arnaut2009-08-284-0/+16
* | | | | | | | | | | | Merge from 5.0 for 43414Staale Smedseng2009-08-2845-156/+119
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | / / / / / / / / / | | |/ / / / / / / / / | |/| | | | | | | | |