summaryrefslogtreecommitdiff
path: root/storage/myisammrg/ha_myisammrg.h
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | WL#3700: Handler API change: all index search methods - that is,unknown2007-01-291-5/+5
| |/ / / /
* | | | | Merge chilla.local:/home/mydev/mysql-5.0-bug26464unknown2007-03-061-2/+2
|/ / / /
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-311-1/+1
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-231-2/+1
|/ / /
* | | Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-mergeunknown2006-10-181-1/+1
|/ /
* | This removes the passing of global hton to engine instance. unknown2006-09-291-1/+1
|/
* Update to push all of merge into the merge storage directory.unknown2006-08-191-0/+88