mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-11 01:20:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.5 into 10.6

Browse source 
To prevent ASAN heap-use-after-poison in the MDEV-16549 part of
./mtr --repeat=6 main.derived
the initialization of Name_resolution_context was cleaned up.
This commit is contained in:
Marko Mäkelä 2022-10-25 14:25:42 +03:00
commit aeccbbd926
114 changed files with 2167 additions and 515 deletions
Download patch file Download diff file Expand all files Collapse all files

6
storage/innobase/gis/gis0rtree.cc
View file

@ -896,7 +896,7 @@ rtr_page_split_and_insert(
lock_prdt_t new_prdt;
rec_t* first_rec = NULL;
int first_rec_group = 1;
ulint n_iterations = 0;
IF_DBUG(bool iterated = false,);
if (!*heap) {
*heap = mem_heap_create(1024);
@ -1128,7 +1128,7 @@ corrupted:
the page, and it'll need the second round split in this case.
We test this scenario here*/
DBUG_EXECUTE_IF("rtr_page_need_second_split",
if (n_iterations == 0) {
if (!iterated) {
rec = NULL;
goto after_insert; }
);
@ -1198,7 +1198,7 @@ after_insert:
parent. */
rtr_clean_rtr_info(cursor->rtr_info, true);
cursor->rtr_info = NULL;
n_iterations++;
IF_DBUG(iterated=true,);
rec_t* i_rec = page_rec_get_next(page_get_infimum_rec(
buf_block_get_frame(block)));