summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2010-12-0633-74/+14
|\
| * mergeVladislav Vaintroub2010-12-0631-72/+10
| |\
| | * Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-0631-72/+10
| * | Fixed test case to be repeatable (after discussion with Igor)Michael Widenius2010-12-062-2/+4
| * | Merge with 5.1-releaseMichael Widenius2010-12-069-22/+13
| |\ \
| * \ \ automatic merge with 5.1-releaseMichael Widenius2010-12-041-1/+0
| |\ \ \
* | | | | Removed compiler warningMichael Widenius2010-12-051-1/+1
* | | | | merge with 5.1-releaseMichael Widenius2010-12-055-14/+7
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fixes to not trigger end-consistency testing of pagecache.Michael Widenius2010-12-054-8/+10
| * | | | The assert removed because it do not take into account case when previous and...unknown2010-12-051-8/+0
* | | | | Automatic mergeMichael Widenius2010-12-0415-27/+92
|\ \ \ \ \
| * \ \ \ \ Automatic merge with 5.1-releaseMichael Widenius2010-12-045-7/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Aria unit tests fixed to have correct pagecache shutdown.unknown2010-12-044-6/+3
| | | |/ / | | |/| |
| | * | | Removed assert as gcc on gentoo couldn't compile it without a warning :(Michael Widenius2010-12-041-1/+0
| | * | | Fixed (wrong) compiler warningMichael Widenius2010-12-041-1/+1
| * | | | Merge with 5.1Michael Widenius2010-12-0416-38/+129
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Automatic merge with 5.1-releaseMichael Widenius2010-12-0411-9/+185
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/|
| | | * Fixed compiler warningMichael Widenius2010-12-042-0/+4
| | | * Fixed compiler warnings.Michael Widenius2010-12-035-8/+76
| | | * Fix problems seen in Buildbot:unknown2010-12-022-0/+3
| | * | mergeVladislav Vaintroub2010-12-0210-29/+47
| | |\ \
| * | | | Fixed compiler warnings but calling field->store(longlong, unsigned_flag) wit...Michael Widenius2010-12-041-5/+5
* | | | | mergeVladislav Vaintroub2010-12-029-28/+51
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | address review commentsVladislav Vaintroub2010-12-021-7/+6
| * | | Adapt fix_vs_config_dir () for VS2010Vladislav Vaintroub2010-12-011-3/+2
| * | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-019-21/+41
| |/ /
* | | automatic merge with 5.1Michael Widenius2010-12-016-2/+103
|\ \ \ | | |/ | |/|
| * | Automatic merge with 5.1Michael Widenius2010-12-011-1/+1
| |\ \ | | |/
| * | Fixed failures in buildbotMichael Widenius2010-12-012-2/+4
| * | Bug#54201: "SET INSERT_ID" event must be ignored if corresponding event is ig...unknown2010-11-304-0/+99
* | | Fixed compiler warningsMichael Widenius2010-12-012-3/+4
* | | merge with 5.1Michael Widenius2010-11-30524-5740/+11664
|\ \ \ | | |/ | |/|
| * | Automatic merge with 5.1-releaseMichael Widenius2010-11-304-3/+7
| |\ \ | | |/
| | * Fixed some compiler warningsMichael Widenius2010-11-304-3/+7
| * | Use three digits after the decimal point for better resolution and comparabil...Hakan Kuecuekyilmaz2010-11-291-1/+1
| * | Automatic merge with 5.1-releaseMichael Widenius2010-11-29519-5725/+11567
| |\ \ | | |/
| | * Fixed compiler and gmake warningsMichael Widenius2010-11-2975-231/+26
| | * Fixed compiler warnings and a compilation failure on windowsMichael Widenius2010-11-277-12/+30
| | * Patch from Sergey Petrunya:Michael Widenius2010-11-263-37/+85
| | * Automatic merge with 5.1Michael Widenius2010-11-255-4/+95
| | |\ | | |/ | |/|
| * | Fix of LP BUG#675248.unknown2010-11-235-4/+95
| | * Fixed failing test casesMichael Widenius2010-11-257-117/+118
| | * Merge of innodb_plugin for MySQL 5.1.53 with xtradbMichael Widenius2010-11-2524-205/+541
| | * A proper fix for bug #57688.Michael Widenius2010-11-253-4/+12
| | * Automatic merge with baseMichael Widenius2010-11-25184-722/+6256
| | |\
| | | * Merge with MySQL 5.1.53Michael Widenius2010-11-25184-722/+6256
| | | |\
| | | | * mergeGeorgi Kodinov2010-11-030-0/+0
| | | | |\
| | | | | * Merge from mysql-5.1.52-releaseunknown2010-11-01155-1815/+4059
| | | | | |\
| | | | * | | test case fixSergey Glukhov2010-11-011-0/+2
| | | | * | | mergeGeorgi Kodinov2010-10-290-0/+0
| | | | |\ \ \
View Lorry Controller Status