summaryrefslogtreecommitdiff
path: root/storage/myisammrg/ha_myisammrg.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '5.5' into 10.0Sergei Golubchik2016-04-261-0/+1
|\
| * Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-201-0/+1
| |\
| | * BUG#20574550 MAIN.MERGE TEST CASE FAILS IF BINLOG_FORMAT=ROWVenkatesh Duggirala2016-02-261-1/+3
| | * Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-1/+2
| | * Fix for bug #11754210 - "45777: CHECK TABLE DOESN'TDmitry Lenev2011-07-221-21/+49
| | * Updated/added copyright headersKent Boortz2011-06-301-2/+2
| | |\
| | | * Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | * | Manual merge from 5.1Mattias Jonsson2011-04-201-3/+3
| | |\ \
| | | * | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-251-5/+4
| | | |/
| | | * Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-201-1/+1
| | * | Bug#49938: Failing assertion: inode or deadlock in fsp/fsp0fsp.cDavi Arnaut2010-10-061-0/+16
| | * | Bug #57002 Assert in upgrade_shared_lock_to_exclusive()Jon Olav Hauglid2010-10-061-2/+25
| | * | Bug #56292 Deadlock with ALTER TABLE and MERGE tablesJon Olav Hauglid2010-09-081-0/+2
| | * | 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-191-3/+2
| | |\ \ \ | | | |/ /
| | | * | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-151-2/+4
| | | |\ \
| | | * \ \ 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-131-2/+2
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-2/+2
| | * | | | 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
| | * | 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-241-296/+557
| | |\ \
| | | * | 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
| | | |\ \
| | | | * \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-02-031-1/+1
| | | | |\ \
| | | | * \ \ 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
| | | * | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-1/+5
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | WL#2360 Performance schemaMarc Alff2009-12-041-3/+7
| | | | |/ / /
| | | * | | | Backport of revid 2617.69.21, 2617.69.22, 2617.29.23:Konstantin Osipov2009-12-081-138/+188
| | | * | | | 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-031-223/+401
| | | * | | | Initial import of WL#3726 "DDL locking for all metadata objects".Konstantin Osipov2009-11-301-0/+6
| | | |/ / /
| | * | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-201-9/+9
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Bug #49829 Many "hides virtual function" warnings withStaale Smedseng2010-03-141-9/+9
| | * | | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-03-121-45/+81
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
| | | * | BUG#48265 - MRG_MYISAM problem (works in 5.0.85, does'tSergey Vojtovich2010-03-031-45/+81
| | * | | 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
| | * | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-171-1/+1
| | |\ \
| | | * \ Merge from mysql-5.1-bugteam.Alexander Nozdrin2009-09-161-1/+1
| | | |\ \ | | | | |/