summaryrefslogtreecommitdiff
path: root/storage/myisammrg
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0 into 10.1Marko Mäkelä2019-03-271-8/+8
|\
| * Merge 5.5 into 10.0bb-10.0-mergeMarko Mäkelä2019-03-261-8/+8
| |\
| | * Fix for MDEV-17449, typo in error message (#1146)Chris Calender2019-03-241-8/+8
* | | fix gcc 8 compiler warningsSergei Golubchik2019-03-141-26/+21
* | | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-0/+2
|\ \ \ | |/ /
| * | Disabled storage engine tests using LOCK with MERGE engineElena Stepanova2018-10-131-0/+2
* | | Merge branch '10.0' into 10.1Sergei Golubchik2017-08-082-6/+6
|\ \ \ | |/ /
| * | MDEV-12915 ST_Centroid does not return the same result than MySQLElena Stepanova2017-08-012-6/+6
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-0/+1
|\ \ \ | |/ /
| * | 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
| | | * Updated/added copyright header. Added line "use is subject to license terms" Murthy Narkedimilli2014-02-171-0/+1
| | | * Updated/added copyright headersMurthy Narkedimilli2014-01-0613-13/+26
| | | * Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1915-15/+15
| | | * Merging into mysql-5.5.16-release.Mats Kindahl2011-08-151-1/+2
| | | * Fix for bug #11754210 - "45777: CHECK TABLE DOESN'TDmitry Lenev2011-07-222-29/+65
| | | * Updated/added copyright headersKent Boortz2011-07-041-1/+2
| | | |\
| | | * \ Updated/added copyright headersKent Boortz2011-06-3010-20/+25
| | | |\ \ | | | | |/ | | | |/|
| | | | * Updated/added copyright headersKent Boortz2011-06-307-13/+29
| | | * | Manual merge from 5.1Mattias Jonsson2011-04-202-4/+4
| | | |\ \
| | | | * | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-252-6/+5
| | | | |/
| | | * | Fix for BUG#59894Guilhem Bichot2011-02-111-3/+3
| | | * | Remove configuration preprocessor symbols 'THREAD'Magne Mahre2011-01-111-2/+0
| | | * | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-202-68/+0
| | | * | Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.Davi Arnaut2010-11-161-1/+1
| | | |\ \ | | | | |/
| | | | * Bug#58057: 5.1 libmysql/libmysql.c unused variable/compile failureDavi Arnaut2010-11-101-1/+1
| | | | * 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-062-0/+17
| | | * | 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
| | | * | 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