summaryrefslogtreecommitdiff
path: root/storage/innobase/row/row0merge.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.3 into 10.4Marko Mäkelä2021-03-311-0/+2
|\
| * Merge 10.2 into 10.3Marko Mäkelä2021-03-311-0/+2
| |\
| | * MDEV-25200 Index count mismatch due to aborted FULLTEXT INDEXThirunarayanan Balathandayuthapani2021-03-301-0/+2
* | | Merge 10.3 into 10.4Marko Mäkelä2021-03-271-4/+0
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2021-03-271-4/+0
| |\ \ | | |/
| | * MDEV-8708 fixup: Remove dead codeMarko Mäkelä2021-03-191-4/+0
* | | Merge 10.3 into 10.4Marko Mäkelä2021-03-181-3/+3
|\ \ \ | |/ /
| * | MDEV-24730 Insert log operation fails after purge resets n_core_fieldsThirunarayanan Balathandayuthapani2021-03-121-3/+3
* | | Merge 10.3 into 10.4Marko Mäkelä2020-09-031-28/+24
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-09-031-28/+24
| |\ \ | | |/
| | * Cleanup: Avoid repeated calls to dict_col_t::is_virtual()Marko Mäkelä2020-09-011-18/+12
| | * MDEV-18366 Crash on SELECT on a table with indexed virtual columnsNikita Malyavin2020-09-011-10/+12
* | | Merge 10.3 into 10.4Marko Mäkelä2020-08-211-1/+1
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-08-211-1/+1
| |\ \ | | |/
* | | Merge remote-tracking branch 'origin/10.3' into 10.4Monty2020-07-031-12/+2
|\ \ \ | |/ /
| * | MDEV-20377 post-fix: Introduce MEM_MAKE_ADDRESSABLEMarko Mäkelä2020-07-021-10/+0
| * | Fixed bugs found by valgrindMonty2020-07-021-11/+11
* | | Merge 10.3 into 10.4Marko Mäkelä2020-07-021-17/+26
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-07-021-17/+26
| |\ \ | | |/
| | * MDEV-20377: Make WITH_MSAN more usableMarko Mäkelä2020-07-011-17/+24
| | * MDEV-22811 DDL fails to drop and re-create FTS indexThirunarayanan Balathandayuthapani2020-06-181-0/+2
* | | Merge 10.3 into 10.4Marko Mäkelä2020-06-051-1/+2
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-06-051-1/+2
| |\ \ | | |/
| | * MDEV-22721 Remove bloat caused by InnoDB logger classMarko Mäkelä2020-06-041-1/+2
* | | Merge 10.3 into 10.4Marko Mäkelä2020-05-161-3/+7
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-05-151-1/+6
| |\ \ | | |/
| | * MDEV-22456 Dropping the adaptive hash index may cause DDL to lock up InnoDBMarko Mäkelä2020-05-151-4/+9
* | | Merge 10.3 into 10.4Marko Mäkelä2020-05-051-16/+16
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Oleksandr Byelkin2020-05-041-16/+16
| |\ \ | | |/
| | * MDEV-21595: innodb offset_t rename to rec_offsDaniel Black2020-04-291-16/+16
* | | Merge 10.3 into 10.4Marko Mäkelä2020-03-201-0/+1
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-03-201-0/+1
| |\ \ | | |/
| | * MDEV-21983: Crash on DROP/RENAME TABLE after DISCARD TABLESPACEMarko Mäkelä2020-03-191-0/+1
* | | Merge 10.3 into 10.4Marko Mäkelä2020-01-201-9/+3
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2020-01-181-9/+3
| |\ \ | | |/
| | * MDEV-21511: Remove unnecessary codeMarko Mäkelä2020-01-171-9/+3
| | * MDEV-20950: Fix 32-bit Windows buildEugene Kosov2019-12-211-2/+4
* | | Merge 10.3 into 10.4Marko Mäkelä2019-12-131-27/+24
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2019-12-131-27/+24
| |\ \ | | |/
| | * MDEV-20950 Reduce size of record offsetsbb-10.2-MDEV-20950-stack-offsetsEugene Kosov2019-12-131-25/+20
* | | Merge 10.3 into 10.4Marko Mäkelä2019-11-111-1/+1
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2019-11-111-1/+1
| |\ \ | | |/
| | * Cleanup btr_page_get_prev(), btr_page_get_next()Marko Mäkelä2019-11-111-1/+1
* | | Merge 10.3 into 10.4Marko Mäkelä2019-11-011-1/+1
|\ \ \ | |/ /
| * | Merge branch '10.2' into 10.3Oleksandr Byelkin2019-10-311-1/+1
| |\ \ | | |/
| | * MDEV-20799 DROP Virtual Column crashes MariaDBSergei Golubchik2019-10-281-1/+1
* | | Update WolfSSL, remove older workarounds.Vladislav Vaintroub2019-07-281-10/+2
* | | Merge 10.3 into 10.4Marko Mäkelä2019-07-251-2/+4
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2019-07-251-2/+1
| |\ \ | | |/
| | * fts_sync_table(), fts_sync() dead code removalMarko Mäkelä2019-07-251-2/+1