diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-06 10:12:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-06 10:12:31 +0300 |
| commit | 26d46234e8316c010d40c02654803aaa7deb370c (patch) | |
| tree | 8c28393932366894c1c7c9a8e804fad12a291147 /storage/innobase/include/gis0rtree.h | |
| parent | 1421d1f2967f1546d2f38de31bc29159b5c9d540 (diff) | |
| download | mariadb-git-26d46234e8316c010d40c02654803aaa7deb370c.tar.gz | |
MDEV-28478: INSERT into SPATIAL INDEX in TEMPORARY table writes log
This is based on commit 20ae4816bba712a3faa0110c973e197d92f43b42
with some adjustments for MDEV-12353.
row_ins_sec_index_entry_low(): If a separate mini-transaction is
needed to adjust the minimum bounding rectangle (MBR) in the parent
page, we must disable redo logging if the table is a temporary table.
For temporary tables, no log is supposed to be written, because
the temporary tablespace will be reinitialized on server restart.
rtr_update_mbr_field(), rtr_merge_and_update_mbr(): Changed the return
type to void and removed unreachable code. In older versions, these
used to return a different value for temporary tables.
page_id_t: Add constexpr to most member functions.
mtr_t::log_write(): Catch log writes to invalid tablespaces
so that the test case would crash without the fix to
row_ins_sec_index_entry_low().
Diffstat (limited to 'storage/innobase/include/gis0rtree.h')
| -rw-r--r-- | storage/innobase/include/gis0rtree.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/storage/innobase/include/gis0rtree.h b/storage/innobase/include/gis0rtree.h index 1a27422a0d8..9a350325bca 100644 --- a/storage/innobase/include/gis0rtree.h +++ b/storage/innobase/include/gis0rtree.h @@ -379,7 +379,7 @@ rtr_page_copy_rec_list_start_no_locks( /****************************************************************//** Merge 2 mbrs and update the the mbr that cursor is on. */ -dberr_t +void rtr_merge_and_update_mbr( /*=====================*/ btr_cur_t* cursor, /*!< in/out: cursor */ @@ -411,9 +411,8 @@ rtr_merge_mbr_changed( /**************************************************************//** -Update the mbr field of a spatial index row. -@return true if successful */ -bool +Update the mbr field of a spatial index row. */ +void rtr_update_mbr_field( /*=================*/ btr_cur_t* cursor, /*!< in: cursor pointed to rec.*/ |