summaryrefslogtreecommitdiff
path: root/storage/myisammrg
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-2/+1
|\
| * Merge from mysql-5.1.Alexander Nozdrin2009-10-131-2/+1
| |\
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-231-2/+1
* | | Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-301-2/+0
* | | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-173-10/+5
|\ \ \ | |/ /
| * | Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-163-10/+5
| |\ \ | | |/
| | * Merge from 5.0 for 43414Staale Smedseng2009-08-283-10/+5
* | | WL#2110 (SIGNAL)Marc Alff2009-09-101-1/+1
|/ /
* | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-123-2/+25
|\ \ | |/
| * Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-9/+2
| |\
| * | Bug#45800 crash when replacing into a merge table and there is a duplicateV Narayanan2009-07-303-2/+25
* | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-044-19/+21
|\ \ \ | | |/ | |/|
| * | Merge 5.1-bugteam -> 5.1-innodb_plugin.Sergey Vojtovich2009-07-143-8/+17
| |\ \ | | |/
| | * 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
| * | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-9/+2
| |/
| * 5.0-bugteam->5.1-bugteam mergeSergey Glukhov2009-05-271-2/+2
* | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-113-13/+96
|\ \ | |/
| * 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
| |/
* | Ensure that all dtrace files are properly removed during make cleanMySQL Build Team2009-04-051-0/+1
* | Fixing some issues in the build when using DTrace probesMC Brown2009-03-181-1/+1
* | Yet another attempt of getting DTrace builds done properlyMikael Ronstrom2009-02-211-3/+3
* | A workaround to handle the problem with thatMikael Ronstrom2009-02-201-3/+8
* | Changed to use top_srcdir instead of abs_top_srcdir since manyMikael Ronstrom2009-02-201-1/+1
* | More readability for DTrace commandsMikael Ronstrom2009-02-201-1/+1
* | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01...Mikael Ronstrom2009-02-171-9/+18
|\ \ | |/
| * Merge 5.0-bugteam -> 5.1-bugteam.Sergey Vojtovich2009-02-041-9/+18
* | Reverted DTrace fixMikael Ronstrom2009-02-061-1/+1
* | Added support for rep; nop replacing PAUSE due to Solaris bugMikael Ronstrom2009-02-031-1/+1
* | A number of fixes to DTrace patchMikael Ronstrom2008-12-201-2/+1
* | Backport of DTrace patches from 6.0Mikael Ronstrom2008-12-202-0/+39
|/
* 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
| |/ |/|