summaryrefslogtreecommitdiff
path: root/storage/myisammrg/ha_myisammrg.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
|\
| * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
* | 5.5 mergeSergei Golubchik2014-05-091-0/+1
|\ \ | |/
| * rename handler::ha_set_lock_type() -> handler::set_lock_type(),Sergei Golubchik2014-04-281-1/+1
| * MDEV-6139: UPDATE w/ join against MRG_MyISAM table with read-only sub-table f...unknown2014-04-281-0/+1
* | MySQL WL#5522 - InnoDB transportable tablespaces.Sergei Golubchik2014-02-021-1/+1
* | 10.0-monty mergeSergei Golubchik2013-07-211-1/+5
|\ \
| * | fix merge.test: online alter table support for MERGE tables, reallySergei Golubchik2013-07-111-0/+3
| * | fix for alter_table_online test.Sergei Golubchik2013-07-101-1/+2
* | | * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-071-1/+0
|/ /
* | simplify the handler api - table_type() is no longer abstract, not even virtualSergei Golubchik2012-12-171-1/+0
|/
* fixed MySQL bug#53775:unknown2012-07-131-0/+6
* 5.3 mergeSergei Golubchik2012-01-131-1/+1
|\
| * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| |\
| | * Updated/added copyright headersKent Boortz2011-07-031-3/+2
| | |\
| * | \ Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-1/+1
| |\ \ \ | | | |/ | | |/|
* | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+3
|\ \ \ \
| * \ \ \ Updated/added copyright headersKent Boortz2011-07-041-1/+2
| |\ \ \ \
| * \ \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+5
* | | | | post-merge fixes.Sergei Golubchik2011-07-021-1/+1
* | | | | 5.5-mergeSergei Golubchik2011-07-021-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Manual merge from 5.1Mattias Jonsson2011-04-201-1/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-251-1/+1
| | |/ /
| * | | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-061-0/+1
* | | | merge.Sergei Golubchik2010-11-251-2/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge MySQL->MariaDBSergey Petrunya2009-09-081-1/+2
| |\ \ | | |/
| * | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-0/+2
| |\ \
| * \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-0/+2
| |\ \ \
| * \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-2/+2
| |\ \ \ \
| | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-2/+2
| | |\ \ \ \
| | | * \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-271-2/+2
| | | |\ \ \ \
| | | | * \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2007-02-281-2/+2
| | | | |\ \ \ \
| | | | | * \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-12-181-2/+2
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge gbichot3.local:/home/mysql_src/mysql-5.1-cleanunknown2006-10-101-2/+2
| | | | | | |\ \ \ \
| | | | | | | * | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-mariaunknown2006-09-071-2/+2
* | | | | | | | | | | Backport of revid 2617.69.21, 2617.69.22, 2617.29.23:Konstantin Osipov2009-12-081-3/+47
* | | | | | | | | | | Backport of:Konstantin Osipov2009-12-031-0/+4
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Bug#45800 crash when replacing into a merge table and there is a duplicateV Narayanan2009-07-301-1/+2
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | Bug#40675 MySQL 5.1 crash with index merge algorithm and Merge tablesV Narayanan2009-02-121-0/+2
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*)unknown2008-04-261-0/+2
|/ / / / / / /
* | | | | | | Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLEunknown2007-11-151-1/+8
|/ / / / / /
* | | | | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarisunknown2007-08-131-5/+6
|/ / / / /
* | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-06-181-0/+1
|\ \ \ \ \
| * \ \ \ \ Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rplunknown2007-06-121-0/+1
| |\ \ \ \ \
| | * | | | | WL#3303 (RBR: Engine-controlled logging format):unknown2007-05-281-0/+1
* | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-enginesunknown2007-06-071-0/+1
|/ / / / / /
* | | | | | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-101-14/+14
|/ / / / /
* | | | | wl#3700 - post-review fixes:unknown2007-03-171-3/+3
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-03-161-5/+5
|\ \ \ \ \
View Lorry Controller Status