summaryrefslogtreecommitdiff
path: root/storage/myisammrg
Commit message (Expand)AuthorAgeFilesLines
* mergeVladislav Vaintroub2010-02-163-287/+589
|\
| * A fix and a test case for Bug#47648 "main.merge fails sporadically".Konstantin Osipov2010-02-151-0/+21
| * Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-1/+1
| |\
| * \ Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-3/+0
| |\ \
| * \ \ Merge next-mr -> next-4284.Konstantin Osipov2009-12-156-39/+93
| |\ \ \
| * | | | Backport of revid 2617.69.21, 2617.69.22, 2617.29.23:Konstantin Osipov2009-12-082-141/+235
| * | | | Backport of:Konstantin Osipov2009-12-081-5/+3
| * | | | Backport of:Konstantin Osipov2009-12-041-1/+1
| * | | | Backport of:Konstantin Osipov2009-12-041-4/+3
| * | | | Backport of:Konstantin Osipov2009-12-033-226/+413
| * | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-0/+6
* | | | | mergeVladislav Vaintroub2010-02-061-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-031-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Manual merge from mysql-5.1-bugteam.Alexander Nozdrin2010-02-031-1/+1
| | |\ \ \
| | | * | | Fix for valgrind warning: check whether pointer was initialized.Davi Arnaut2010-02-021-1/+1
* | | | | | Cleanup casing in MYSQL_ADD_PLUGIN, patch provided by KentVladislav Vaintroub2010-02-011-1/+1
* | | | | | mergeVladislav Vaintroub2009-12-161-3/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-3/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-3/+0
* | | | | | Cleanup, use MYSQL_INSTALL_TARGETS macro instead of INSTALL(TARGETS) combined...Vladislav Vaintroub2009-12-121-3/+0
* | | | | | mergeVladislav Vaintroub2009-12-111-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge mysql-next-mr to mysql-next-mr-svoj.Sergey Vojtovich2009-12-091-0/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Backport from 6.0-codebase.Sergey Vojtovich2009-11-251-0/+3
| | |/ / /
* | | | | mergeVladislav Vaintroub2009-12-106-41/+95
|\ \ \ \ \ | |/ / / /
| * | | | WL#2360 Performance schemaMarc Alff2009-12-046-41/+95
| | |_|/ | |/| |
* | | | - Introduce MYSQL_ADD_PLUGIN that replaces MYSQL_STORAGE_ENGINEVladislav Vaintroub2009-12-011-1/+1
* | | | mergeVladislav Vaintroub2009-11-253-14/+14
|\ \ \ \ | |/ / /
| * | | Backport of:Konstantin Osipov2009-11-243-14/+14
| |/ /
* | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-091-1/+2
|/ /
* | 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