summaryrefslogtreecommitdiff
path: root/storage/innobase/row/row0merge.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.11 into 11.0Marko Mäkelä2023-04-261-5/+0
|\
| * Merge 10.6 into 10.8Marko Mäkelä2023-04-261-5/+0
| |\
| | * Merge 10.5 into 10.6Marko Mäkelä2023-04-251-5/+0
| | |\
| | | * Merge branch '10.4' into 10.5Oleksandr Byelkin2023-04-241-5/+0
| | | |\
| | | | * MDEV-31025 Redundant table alter fails when fixed columnThirunarayanan Balathandayuthapani2023-04-191-5/+0
* | | | | Merge 10.11 into 11.0Marko Mäkelä2023-03-291-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.6 into 10.8Marko Mäkelä2023-03-291-1/+2
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.5 into 10.6Marko Mäkelä2023-03-281-1/+2
| | |\ \ \ | | | |/ /
* | | | | Merge 10.11 into 11.0Marko Mäkelä2023-01-251-12/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.7 into 10.8Marko Mäkelä2023-01-241-12/+6
| |\ \ \ \
| | * \ \ \ Merge 10.6 into 10.7Marko Mäkelä2023-01-241-12/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-30400 Assertion height == btr_page_get_level(...) on INSERTMarko Mäkelä2023-01-241-12/+6
| | | * | | Revert "MDEV-30400 Assertion height == btr_page_get_level(...) on INSERT"Marko Mäkelä2023-01-231-6/+12
| | | * | | MDEV-30400 Assertion height == btr_page_get_level(...) on INSERTMarko Mäkelä2023-01-191-12/+6
* | | | | | MDEV-29694 Remove the InnoDB change bufferMarko Mäkelä2023-01-111-3/+1
|/ / / / /
* | | | | Merge 10.7 into 10.8Marko Mäkelä2023-01-101-18/+20
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.6 into 10.7Marko Mäkelä2023-01-041-17/+19
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.5 into 10.6Marko Mäkelä2023-01-031-17/+19
| | |\ \ \ | | | |/ /
| | | * | Merge 10.4 into 10.5Marko Mäkelä2023-01-031-15/+18
| | | |\ \ | | | | |/
| | | | * Merge 10.3 into 10.4Marko Mäkelä2023-01-031-15/+18
| | | | |\
| | | | | * MDEV-25004 RefactoringsMarko Mäkelä2022-12-271-14/+14
| | | | | * MDEV-25004 Missing row in FTS_DOC_ID_INDEX during DELETE HISTORYAleksey Midenkov2022-12-271-15/+18
| * | | | | MDEV-30321: blob data corrupted by row_merge_write_blob_to_tmp_file()Michael Roosz2023-01-041-1/+1
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-11-301-9/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-11-301-9/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-30132 Crash after recovery, with InnoDB: Tried to read ...Marko Mäkelä2022-11-301-8/+4
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-11-211-0/+37
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Cleanup: Define less of bulk insert inlineMarko Mäkelä2022-11-211-0/+37
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-11-171-8/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-11-171-8/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-29603 btr_cur_open_at_index_side() is missing some consistency checksMarko Mäkelä2022-11-171-6/+8
| | * | | | MDEV-29603: Implement btr_cur_t::open_leaf()Marko Mäkelä2022-11-161-2/+1
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-11-091-93/+70
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-11-091-93/+70
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-11-081-94/+71
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.4 into 10.5Marko Mäkelä2022-11-081-94/+71
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 10.3 into 10.4Marko Mäkelä2022-11-081-101/+69
| | | | |\ \ | | | | | |/
| | | | | * MDEV-29856 heap-use-after-poison in row_merge_spatial_rows() w/ column prefixMarko Mäkelä2022-11-081-101/+69
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-11-011-5/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 10.6 into 10.7Daniel Black2022-10-251-5/+9
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-24402: InnoDB CHECK TABLE ... EXTENDEDMarko Mäkelä2022-10-211-5/+9
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-10-131-3/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-10-131-3/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-10-061-3/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.4 into 10.5Marko Mäkelä2022-10-061-4/+3
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 10.3 into 10.4Marko Mäkelä2022-10-051-4/+3
| | | | |\ \ | | | | | |/
| | | | | * MDEV-27927 row_sel_try_search_shortcut_for_mysql() does not latch a page, vio...Vlad Lesin2022-10-051-4/+3
* | | | | | Merge 10.7 into 10.8Marko Mäkelä2022-09-211-8/+10
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.6 into 10.7Marko Mäkelä2022-09-211-8/+10
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.5 into 10.6Marko Mäkelä2022-09-201-8/+10
| | |\ \ \ \ | | | |/ / /