summaryrefslogtreecommitdiff
path: root/storage/myisammrg
Commit message (Expand)AuthorAgeFilesLines
* Added support of thd->tx_read_onlyMichael Widenius2012-08-071-17/+0
* 5.3 mergeSergei Golubchik2012-01-133-3/+4
|\
| * Merge with 5.2.Michael Widenius2011-12-117-13/+28
| |\
| | * Merge with MariaDB 5.1Michael Widenius2011-11-247-13/+28
| | |\
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-217-13/+28
| | | |\
| | | | * Updated/added copyright headersKent Boortz2011-07-032-9/+7
| | | | |\
| * | | | \ mergeSergei Golubchik2011-10-111-1/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | merge with 5.1Sergei Golubchik2011-10-071-1/+0
| | |\ \ \ \ | | | |/ / /
| | | * | | remove redundant declarationsSergei Golubchik2011-10-041-1/+0
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0311-50/+93
|\ \ \ \ \ \
| * | | | | | Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-1/+2
| * | | | | | Fix for bug #11754210 - "45777: CHECK TABLE DOESN'TDmitry Lenev2011-07-222-29/+65
| * | | | | | Updated/added copyright headersKent Boortz2011-07-041-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Updated/added copyright headersKent Boortz2011-06-3010-20/+25
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | / / | | | |_|_|/ / | | |/| | | |
| | * | | | | Updated/added copyright headersKent Boortz2011-06-307-13/+29
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-2/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-102-6/+5
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge with MariaDB 5.1Michael Widenius2011-05-032-6/+5
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-022-6/+5
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| * | | | | | Merge with 5.1Michael Widenius2011-01-111-2/+2
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixed typosMichael Widenius2011-01-071-2/+2
| * | | | | | mergeVladislav Vaintroub2010-12-061-2/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | mergeVladislav Vaintroub2010-12-061-2/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-2/+0
| * | | | | | Merge with 5.1-release.Michael Widenius2010-12-062-8/+14
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | merge with 5.1Michael Widenius2010-11-301-3/+0
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fixed compiler and gmake warningsMichael Widenius2010-11-291-3/+0
| | * | | | | Merge MariaDB 5.1->5.2unknown2010-11-192-5/+14
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | MWL#74: Shared libmysqld.so library.unknown2010-11-172-5/+14
* | | | | | | less boilerplate code - move common operations to wrappersSergei Golubchik2011-07-141-23/+0
* | | | | | | post-merge fixes.Sergei Golubchik2011-07-022-3/+3
* | | | | | | 5.5-mergeSergei Golubchik2011-07-026-78/+50
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Manual merge from 5.1Mattias Jonsson2011-04-202-4/+4
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-252-6/+5
| | | |_|_|/ | | |/| | |
| * | | | | Fix for BUG#59894Guilhem Bichot2011-02-111-3/+3
| * | | | | Remove configuration preprocessor symbols 'THREAD'Magne Mahre2011-01-111-2/+0
| * | | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-202-68/+0
| * | | | | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-11-161-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-1/+1
| | * | | | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-201-1/+1
| * | | | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-062-0/+17
| * | | | | Bug #57002 Assert in upgrade_shared_lock_to_exclusive()Jon Olav Hauglid2010-10-061-2/+25
| * | | | | Bug #56292 Deadlock with ALTER TABLE and MERGE tablesJon Olav Hauglid2010-09-081-0/+2
* | | | | | lots of post-merge changesSergei Golubchik2011-04-251-2/+2
* | | | | | merge.Sergei Golubchik2010-11-258-27/+71
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Automerge with 5.2Michael Widenius2010-11-053-14/+11
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Automatic merge with 5.1Michael Widenius2010-11-043-14/+11
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-023-14/+11
| * | | | Merge 5.2->5.3Sergey Petrunya2010-10-102-10/+5
| |\ \ \ \ | | |/ / /
| | * | | merge with 5.1Sergei Golubchik2010-09-112-7/+2
| | |\ \ \ | | | |/ /