summaryrefslogtreecommitdiff
path: root/storage/innobase/row/row0merge.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2020-09-041-28/+24
|\
| * 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.4 into 10.5Marko Mäkelä2020-08-211-1/+1
|\ \ \ \ | |/ / /
| * | | 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.4' into 10.5Monty2020-07-031-12/+2
|\ \ \ \ | |/ / /
| * | | 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.4 into 10.5Marko Mäkelä2020-07-021-17/+26
|\ \ \ \ | |/ / /
| * | | 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.4 into 10.5Marko Mäkelä2020-06-051-1/+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
* | | | MDEV-15053 Reduce buf_pool_t::mutex contentionMarko Mäkelä2020-06-051-1/+1
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-05-181-3/+7
|\ \ \ \ | |/ / /
| * | | 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.4 into 10.5Marko Mäkelä2020-05-051-16/+16
|\ \ \ \ | |/ / /
| * | | 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
* | | | MDEV-22332: Assertion mtr_started == mtr.is_active() failedMarko Mäkelä2020-04-221-1/+1
* | | | Merge pull request #1221 from grooverdan/10.4-MDEV-18851-multiple-sized-large...Daniel Black2020-04-021-3/+2
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-03-211-16/+0
|\ \ \ \ | |/ / /
| * | | 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
* | | | MDEV-21907: InnoDB: Enable -Wconversion on clang and GCCMarko Mäkelä2020-03-121-2/+3
* | | | MDEV-21907: Fix most clang -Wconversion in InnoDBMarko Mäkelä2020-03-111-14/+23
* | | | perfschema compilation, test and misc fixesSergei Golubchik2020-03-101-3/+3
* | | | MDEV-14425 Cleanup: Use std::atomic for some log_sys membersMarko Mäkelä2020-03-051-3/+2
* | | | MDEV-14425 preparation: Remove log_t::append_on_checkpointMarko Mäkelä2020-03-031-115/+0
* | | | MDEV-19747: Deprecate and ignore innodb_log_optimize_ddlMarko Mäkelä2020-02-111-79/+3
* | | | Cleanup: Remove mtr_state_t and mtr_t::m_stateMarko Mäkelä2020-01-291-52/+51
* | | | Merge 10.4 into 10.5Marko Mäkelä2020-01-201-9/+3
|\ \ \ \ | |/ / /
| * | | 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.4 into 10.5Marko Mäkelä2019-12-161-27/+24
|\ \ \ \ | |/ / /
| * | | Merge 10.3 into 10.4Marko Mäkelä2019-12-131-27/+24
| |\ \ \ | | |/ /