summaryrefslogtreecommitdiff
path: root/storage/myisammrg/ha_myisammrg.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge from 5.0 for 43414Staale Smedseng2009-08-281-1/+1
* Bug#45800 crash when replacing into a merge table and there is a duplicateV Narayanan2009-07-301-1/+5
* Bug #45796: invalid memory reads and writes when altering merge Alexey Kopytov2009-07-101-1/+2
* 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-05-271-2/+2
* Bug#37631 Incorrect key file for table after upgrading from 5.0 to 5.1Narayanan V2009-04-081-2/+3
* auto-mergeIgnacio Galarza2009-03-171-4/+85
|\
| * fixing warning during compilation.Anurag Shekhar2009-03-091-1/+1
| * Bug#41305 server crashes when inserting duplicate row into a merge tableAnurag Shekhar2009-03-041-0/+10
| * Bug#40675 MySQL 5.1 crash with index merge algorithm and Merge tablesV Narayanan2009-02-121-4/+75
* | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-4/+4
|/
* Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*)gshchepa/uchum@host.loc2008-04-261-0/+6
* Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-281-1/+1
|\
| * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-02-081-1/+1
| |\
| | * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2007-12-071-1/+1
| | |\
| | | * Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1monty@mysql.com/narttu.mysql.fi2007-10-111-1/+1
* | | | Merge stella.local:/home2/mydev/mysql-5.0-axmrgistruewing@stella.local2008-03-141-0/+6
|/ / /
* | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1gluh@eagle.(none)2007-12-131-1/+5
|\ \ \
| * | | Merge polly.(none):/home/kaa/src/opt/bug28837/my50-bug29131kaa@polly.(none)2007-11-261-1/+5
| | |/ | |/|
* | | Bug#30273 - merge tables: Can't lock file (errno: 155)istruewing@stella.local2007-12-111-2/+29
| |/ |/|
* | Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLEistruewing@stella.local2007-11-151-89/+579
|/
* Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarismonty@mysql.com/nosik.monty.fi2007-08-131-8/+8
* Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-enginessvoj@june.mysql.com2007-06-141-1/+12
* BUG#26976 - Missing table in merge not noted in related error msg +svoj@mysql.com/june.mysql.com2007-06-081-1/+0
* Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-enginessvoj@june.mysql.com2007-06-071-1/+25
* Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-241-19/+19
|\
| * WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-19/+19
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@sergbook.mysql.com2007-04-161-24/+13
|\ \ | |/ |/|
| * WL#2936antony@ppcg5.local2007-03-021-24/+13
* | wl#3700 - post-review fixes:serg@janus.mylan2007-03-171-3/+3
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-03-061-0/+3
|\ \
| * | Remove compiler warningsmonty@mysql.com/narttu.mysql.fi2007-02-271-4/+3
| * | Fixes for compiler warnings.jani@a88-113-38-195.elisa-laajakaista.fi2007-02-271-0/+4
| |/
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@janus.mylan2007-02-211-6/+9
|\ \ | |/ |/|
| * WL#3700: Handler API change: all index search methods - that is,serg@janus.mylan2007-01-291-6/+9
* | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1svoj@june.mysql.com2007-02-051-17/+13
|\ \
| * | After merge fixesmonty@mysql.com/narttu.mysql.fi2007-01-291-3/+0
| * | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-14/+13
| |/
* | Merge mysql.com:/home/svoj/devel/mysql/WL3567/mysql-5.0-enginessvoj@june.mysql.com2007-01-311-1/+38
|/
* Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-311-1/+1
* Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
* Merge bk-internal.mysql.com:/data0/bk/mysql-5.1baker@bk-internal.mysql.com2006-11-281-1/+1
|\
| * Merge mysql.com:/home/my/mysql-5.0monty@nosik.monty.fi2006-11-221-1/+1
* | This straightens up usage of have_ variables, and removes dead -skip-isam opt...brian@zim.(none)2006-11-201-1/+1
|/
* Merge willster.(none):/home/stewart/Documents/MySQL/5.0/bug19914-mk2-mergestewart@willster.(none)2006-10-181-1/+2
* Merge mysql.com:/home/svoj/devel/mysql/engines/mysql-5.0-enginessvoj@april.(none)2006-10-081-1/+1
* Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.1svoj@may.pils.ru2006-10-081-1/+14
|\
| * Merge mysql.com:/home/svoj/devel/mysql/BUG22937/mysql-5.0-enginessvoj@april.(none)2006-10-061-1/+14
* | Added license information display to output of plugins schema, and tagged all...brian@zim.(none)2006-10-051-0/+1
|/
* This patch adds handlerton passing to functions. NDB and Innodb still require...brian@zim.(none)2006-09-301-9/+13
* This removes the passing of global hton to engine instance. brian@zim.(none)2006-09-291-4/+5