summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge DS-MRR/CPK improvements into 5.3-mainSergey Petrunya2010-12-136-15/+20
|\
| * Merge MWL#121-125 DS-MRR improvements into MWL#128 Classic hash join treeSergey Petrunya2010-11-156-15/+20
| |\
| | * Merge MWL#121-124 DS-MRR support for key-ordered reads + MWL#128 BNL-Hash joinSergey Petrunya2010-11-016-15/+20
| | |\
| | | * MWL#121-124 DS-MRR support for key-ordered retrieval, etcSergey Petrunya2010-11-016-15/+20
| | | |\
| | | | * DS-MRR support for clustered primary keys and key-ordered retrieval: merge wi...Sergey Petrunya2010-08-096-15/+20
| | | | |\
| | | | | * MWL#121: DS-MRR support for clustered primary keysSergey Petrunya2010-07-166-15/+20
| | | | | |\
| | | | | | * MWL#121: DS-MRR support for clustered primary keysSergey Petrunya2010-06-226-14/+10
| | | | | | * MWL#121: DS-MRR support for clustered primary keysSergey Petrunya2010-06-196-21/+30
* | | | | | | Merge.Igor Babaev2010-12-102-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MergeIgor Babaev2010-11-102-0/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ MergeIgor Babaev2010-11-052-0/+3
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ MergeIgor Babaev2010-11-022-0/+3
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge.Igor Babaev2010-10-302-0/+3
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | | * | | | Merge 5.3-mwl128 -> 5.3Igor Babaev2010-10-272-0/+3
| | | | | |\ \ \ \
| | | | | | * \ \ \ MergeIgor Babaev2010-08-312-0/+3
| | | | | | |\ \ \ \ | | | | | | | |/ / / | | | | | | |/| | |
| | | | | | | * | | The main patch for MWL#128: Implement Block Nested Loop Hash Join.Igor Babaev2010-08-313-0/+4
| | | | | | | |/ /
* | | | | | | | | merge LP Bug#686184Vladislav Vaintroub2010-12-072-2/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ merge LP Bug#686184Vladislav Vaintroub2010-12-072-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix myisam_crash_before_flush_keys on WindowsVladislav Vaintroub2010-12-071-1/+1
| | * | | | | | | | | Fix LP Bug#686184 - merge_debug test fails.Vladislav Vaintroub2010-12-061-1/+1
* | | | | | | | | | | Post-merge fixes: fix compile failure in buildbotSergey Petrunya2010-12-061-2/+10
* | | | | | | | | | | mergeVladislav Vaintroub2010-12-0614-37/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | mergeVladislav Vaintroub2010-12-0614-37/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | mergeVladislav Vaintroub2010-12-0614-37/+0
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-0614-37/+0
| | * | | | | | | | | | Merge with 5.1-releaseMichael Widenius2010-12-067-16/+7
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ automatic merge with 5.1-releaseMichael Widenius2010-12-041-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ Merge with 5.1-release.Michael Widenius2010-12-06220-2446/+2585
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | merge with 5.1-releaseMichael Widenius2010-12-053-10/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Fixes to not trigger end-consistency testing of pagecache.Michael Widenius2010-12-052-2/+4
| | * | | | | | | | | | | | The assert removed because it do not take into account case when previous and...unknown2010-12-051-8/+0
| * | | | | | | | | | | | | 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-045-21/+97
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Automatic merge with 5.1-releaseMichael Widenius2010-12-043-9/+72
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | / / / / / / / / / | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Fixed compiler warningMichael Widenius2010-12-042-0/+4
| | | * | | | | | | | | Fixed compiler warnings.Michael Widenius2010-12-032-7/+65
| | * | | | | | | | | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warningsVladislav Vaintroub2010-12-013-13/+28
| * | | | | | | | | | | Fixed compiler warnings but calling field->store(longlong, unsigned_flag) wit...Michael Widenius2010-12-041-5/+5
| * | | | | | | | | | | automatic merge with 5.1Michael Widenius2010-12-011-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fixed failures in buildbotMichael Widenius2010-12-011-2/+3
| | |/ / / / / / / / /
| * | | | | | | | | | Fixed compiler warningsMichael Widenius2010-12-011-3/+3
| * | | | | | | | | | merge with 5.1Michael Widenius2010-11-30181-2050/+1993
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Fixed some compiler warningsMichael Widenius2010-11-301-3/+3
| | * | | | | | | | | Fixed compiler and gmake warningsMichael Widenius2010-11-2949-144/+1
| | * | | | | | | | | Fixed compiler warnings and a compilation failure on windowsMichael Widenius2010-11-273-6/+6
| | * | | | | | | | | Patch from Sergey Petrunya:Michael Widenius2010-11-261-3/+4
| | * | | | | | | | | Merge of innodb_plugin for MySQL 5.1.53 with xtradbMichael Widenius2010-11-2522-200/+538