summaryrefslogtreecommitdiff
path: root/storage/myisammrg
Commit message (Expand)AuthorAgeFilesLines
* Bug #56292 Deadlock with ALTER TABLE and MERGE tablesJon Olav Hauglid2010-09-081-0/+2
* Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-121-2/+2
* Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-291-5/+0
|\
| * Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-5/+0
| |\
| | * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-5/+0
* | | Merge trunk-bugfixing -> trunk-runtime.Konstantin Osipov2010-07-271-1/+1
|\ \ \
| * | | Add a maintainer target to the warning-mode of the build scripts.Davi Arnaut2010-07-241-1/+1
| |/ /
* | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-07-193-6/+2
|\ \ \ | |/ /
| * | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-153-11/+10
| |\ \
| | * | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-3/+0
| * | | Unset the execute bit where it's not needed.Davi Arnaut2010-07-031-0/+0
| * | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-021-3/+2
| |\ \ \ | | | |/ | | |/|
| | * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-3/+4
* | | | merge from mysql-trunk-bugfixingJon Olav Hauglid2010-07-133-8/+8
|\ \ \ \ | | |_|/ | |/| |
| * | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-083-8/+8
* | | | A fix and a test case for Bug#36171 "CREATE TEMPORARY TABLE and Konstantin Osipov2010-07-021-12/+11
* | | | A test case for Bug#50788 "main.merge fails on HPUX",Konstantin Osipov2010-07-021-0/+2
|/ / /
* | | Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111Alexander Nozdrin2010-06-251-0/+2
|/ /
* | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-06-101-3/+3
|\ \ | |/
| * Bug#42733: Type-punning warnings when compiling MySQL --Davi Arnaut2010-06-101-3/+3
* | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-05-311-3/+11
* | Backport ofAlexander Nozdrin2010-05-311-1/+11
* | Patch for Bug#53937 (Junk make-ccc files included in MySQL Server bzr repo).Alexander Nozdrin2010-05-261-3/+0
* | Another incarnation of the patch for Bug#30708Alexander Nozdrin2010-05-191-3/+0
* | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-2/+7
* | Manual merge of mysql-trunk into mysql-trunk-merge.Alexey Kopytov2010-03-249-346/+708
|\ \
| * \ 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
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| * | | | | | 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
| | |\ \ \ \ \
| * | | | | | | 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
| |\ \ \ \ \ \ | | |/ / / / /