summaryrefslogtreecommitdiff
path: root/storage/myisammrg/ha_myisammrg.cc
Commit message (Expand)AuthorAgeFilesLines
* MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
* 5.5 mergeSergei Golubchik2014-05-091-0/+18
|\
| * rename handler::ha_set_lock_type() -> handler::set_lock_type(),Sergei Golubchik2014-04-281-2/+2
| * MDEV-6139: UPDATE w/ join against MRG_MyISAM table with read-only sub-table f...unknown2014-04-281-0/+18
* | 10.0-base mergeSergei Golubchik2013-12-161-19/+24
|\ \
| * \ 5.5 mergeSergei Golubchik2013-12-151-19/+24
| |\ \ | | |/
| | * 5.3 mergeSergei Golubchik2013-12-131-19/+24
| | |\
| | | * 5.2 mergeSergei Golubchik2013-12-021-19/+24
| | | |\
| | | | * 5.1 mergeSergei Golubchik2013-12-011-19/+24
| | | | |\
| | | | | * MDEV-5266 MySQL:57657 - Temporary MERGE table with temporary underlying is br...Sergei Golubchik2013-11-291-19/+24
* | | | | | MDEV-5042 - Server crashes when accessing incorrect MERGE table from triggerSergey Vojtovich2013-10-141-2/+6
* | | | | | 10.0-monty mergeSergei Golubchik2013-07-211-20/+53
|\ \ \ \ \ \
| * | | | | | fix merge.test: online alter table support for MERGE tables, reallySergei Golubchik2013-07-111-10/+39
| * | | | | | fix for alter_table_online test.Sergei Golubchik2013-07-101-5/+6
| * | | | | | Fixed issues with partitions and create temporary table SELECT ...Michael Widenius2013-07-031-1/+1
| * | | | | | mdl_sync now works.Michael Widenius2013-07-021-3/+1
| * | | | | | merge of 2876.430.11 & 2876.430.1unknown2013-06-271-0/+5
| * | | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-1/+1
* | | | | | | 10.0-base mergeSergei Golubchik2013-06-061-1/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 5.5 mergeSergei Golubchik2013-06-061-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-1/+1
* | | | | | | 10.0-base mergeSergei Golubchik2013-04-151-6/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | |
| * | | | | * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-071-6/+1
| * | | | | 5.5 mergeSergei Golubchik2013-03-271-0/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | 5.3 mergeSergei Golubchik2013-03-271-0/+14
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-4277: Crash inside mi_killed_in_mariadb() with myisammrgSergey Petrunya2013-03-211-0/+14
| | | |/ /
* | | | | 10.0-base mergeSergei Golubchik2013-01-311-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-18/+1
|\ \ \ \ \ | |/ / / /
| * | | | simplify the handler api - table_type() is no longer abstract, not even virtualSergei Golubchik2012-12-171-18/+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-191-0/+41
|\ \ \ \ | |/ / /
| * | | fixed MySQL bug#53775:unknown2012-07-131-0/+41
* | | | Added support of thd->tx_read_onlyMichael Widenius2012-08-071-17/+0
|/ / /
* | | 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\ \ \ | |/ /
| * | Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+3
| |\ \ | | |/
| | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+3
| | |\
| | | * Updated/added copyright headersKent Boortz2011-07-031-6/+5
| | | |\
* | | | \ mysql-5.5.18 mergeSergei Golubchik2011-11-031-24/+53
|\ \ \ \ \
| * | | | | Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-1/+2
| * | | | | Fix for bug #11754210 - "45777: CHECK TABLE DOESN'TDmitry Lenev2011-07-221-21/+49
| * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | merge with 5.3Sergei Golubchik2011-10-191-2/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-5/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-5/+4
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| * | | | | Fixed typosMichael Widenius2011-01-071-2/+2
* | | | | | less boilerplate code - move common operations to wrappersSergei Golubchik2011-07-141-23/+0
* | | | | | post-merge fixes.Sergei Golubchik2011-07-021-2/+2