summaryrefslogtreecommitdiff
path: root/storage/myisammrg
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-9/+2
|\
| * Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-143-8/+17
| |\
| * | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-9/+2
* | | Bug#45800 crash when replacing into a merge table and there is a duplicateV Narayanan2009-07-303-2/+25
| |/ |/|
* | Bug #45796: invalid memory reads and writes when altering merge Alexey Kopytov2009-07-102-7/+16
* | Bug #45286: compilation warnings on mysql-5.0-bugteam on MacOSXGeorgi Kodinov2009-06-051-1/+1
|/
* 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-173-7/+89
|\
| * 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
| * Merge 5.1-bugteam -> 5.1-bugteam (local).Sergey Vojtovich2009-02-123-6/+77
| |\
| | * Bug#40675 MySQL 5.1 crash with index merge algorithm and Merge tablesV Narayanan2009-02-123-6/+77
| * | BUG#39185 - Cardinality for merge tables calculated incorrectly.Sergey Vojtovich2009-02-051-1/+2
| |/
* | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-4/+4
|/
* Merge 5.0-bugteam -> 5.1-bugteam.Sergey Vojtovich2009-02-041-9/+18
* Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*)unknown2008-04-265-2/+37
* Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-281-1/+1
|\
| * Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-271-1/+1
| |\
| | * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-081-1/+1
| | |\
| | | * Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-071-1/+1
| | | |\
| | | | * Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-111-1/+1
* | | | | Merge stella.local:/home2/mydev/mysql-5.0-axmrgunknown2008-03-141-0/+6
|/ / / /
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-02-211-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Bug#31929 Windows build fails with >=4 Parallel build threads.unknown2008-01-291-0/+1
| | |/ | |/|
* | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-12-131-1/+5
|\ \ \
| * | | Merge polly.(none):/home/kaa/src/opt/bug28837/my50-bug29131unknown2007-11-261-1/+5
| |/ /
* | | Bug#30273 - merge tables: Can't lock file (errno: 155)unknown2007-12-113-3/+46
| |/ |/|
* | Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLEunknown2007-11-155-101/+948
|/
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-08-161-4/+6
|\
| * CMakeLists.txt (many), win/README, mysql_manifest.cmake, configure.js:unknown2007-08-061-4/+6
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-08-143-15/+16
|\ \ | |/ |/|
| * Fixed a lot of compiler warnings and errors detected by Forte C++ on Solarisunknown2007-08-133-15/+16
* | Merge trift2.:/MySQL/M51/bug29982-5.1unknown2007-08-021-0/+0
|\ \ | |/ |/|
| * Fix a bad BitKeeper dependency structure for the "CMakeLists.txt" files.unknown2007-07-311-0/+0
* | BUG#29806 - binlog_innodb.test creates a server logunknown2007-07-251-0/+8
|/
* Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-06-181-0/+1
|\
| * 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
| | |\
| | | * 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 chilla.local:/home/mydev/mysql-5.1-amainunknown2007-06-164-3/+53
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-enginesunknown2007-06-141-1/+12
| * | | | BUG#26976 - Missing table in merge not noted in related error msg +unknown2007-06-081-1/+0
| * | | | Merge mysql.com:/home/svoj/devel/mysql/BUG26976/mysql-5.0-enginesunknown2007-06-074-2/+42
| |/ / /
* | | | Embedded Server doesn't build on Windows.unknown2007-06-151-0/+3
|/ / /
* | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-2417-68/+69
|\ \ \ | |/ / |/| |
| * | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-1017-68/+69
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2007-04-271-24/+13
|\ \ \ | |/ / |/| |
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-161-24/+13
| |\ \ | | |/ | |/|