summaryrefslogtreecommitdiff
path: root/storage/myisammrg
Commit message (Expand)AuthorAgeFilesLines
* 10.0-base mergeSergei Golubchik2013-04-1565-4703/+5596
|\
| * * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-072-7/+1
| * 5.5 mergeSergei Golubchik2013-03-2764-4696/+5595
| |\
| | * 5.3 mergeSergei Golubchik2013-03-271-0/+14
| | |\
| | | * MDEV-4277: Crash inside mi_killed_in_mariadb() with myisammrgSergey Petrunya2013-03-211-0/+14
| | * | MDEV-4028 - Converted rdiff files to uniformElena Stepanova2013-02-0363-4696/+5581
* | | | 10.0-base mergeSergei Golubchik2013-01-312-2/+2
|\ \ \ \ | |/ / /
| * | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-1/+1
| * | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-1/+1
| * | | MDEV-3990: engine tests went out of sync with current MariaDB codeElena Stepanova2013-01-131-1/+1
* | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-182-19/+1
|\ \ \ \ | |/ / /
| * | | simplify the handler api - table_type() is no longer abstract, not even virtualSergei Golubchik2012-12-172-19/+1
| * | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-4/+0
| |/ /
* | | 10.0-base -> 10.0-montySergei Golubchik2012-10-1970-0/+5134
|\ \ \ | |/ /
| * | MDEV-11: Generic storage engine test suiteElena Stepanova2012-07-1668-0/+5087
| * | fixed MySQL bug#53775:unknown2012-07-132-0/+47
* | | fixes for test failuresSergei Golubchik2012-09-271-5/+2
* | | 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
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
View Lorry Controller Status