summaryrefslogtreecommitdiff
path: root/storage/myisammrg
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL 5.1.39 into MariaDB 5.1.mariadb-merge-mysql-5.1.39unknown2009-10-153-10/+5
|\
| * Merge from 5.0 for 43414Staale Smedseng2009-08-283-10/+5
* | Apply Igor's fix:Sergey Petrunya2009-09-181-1/+1
* | Merge MySQL->MariaDBmariadb-merge-mysql-5.1.38minusSergey Petrunya2009-09-085-22/+48
|\ \ | |/
| * 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
* | Fixed problems in mergeMichael Widenius2009-05-191-1/+1
|\ \
| * | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-1/+1
* | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-4/+4
|\ \ \ | | |/ | |/|
| * | auto-mergeIgnacio Galarza2009-03-173-7/+89
| |\ \
| * | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-4/+4
* | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-013-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
| |/ /
* | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-9/+18
|\ \ \ | |/ / | | / | |/ |/|
| * Merge 5.0-bugteam -> 5.1-bugteam.Sergey Vojtovich2009-02-041-9/+18
* | Fixed warnings and errors discovered by pushbuild2Michael Widenius2008-12-041-3/+3
* | Merged 5.1 with maria 5.1Michael Widenius2008-10-105-2/+37
|\ \ | |/
| * Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*)unknown2008-04-265-2/+37
* | wt: comments, OOM checks, test case for deadlock detectionSergei Golubchik2008-08-281-1/+1
* | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-282-0/+7
|\ \ | |/
| * 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 a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-162-5/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-272-5/+8
| |\ \ \ | | |/ / | |/| |
| | * | Fixed several bugs found by running *.test with maria engineunknown2007-09-031-1/+2
| | * | Merged with mysql-5.1 main tree.unknown2007-07-021-10/+10
| | * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-272-10/+12
| | |\ \
| | | * | merge from MyISAM into Maria (last step of merge of 5.1 into Maria).unknown2007-03-011-8/+10
| | | * | 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-201-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
| | | | | | | |\ \
* | | | | | | | \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-12-131-1/+5
|\ \ \ \ \ \ \ \ \ \
View Lorry Controller Status