Merging mysql-8.0 to mysql-trunk

gurusami · gurusami · commit b71fef63631e · 2021-06-22T07:31:19.000+02:00
diff --git a/storage/innobase/lob/lob0first.cc b/storage/innobase/lob/lob0first.cc
@@ -303,9 +303,11 @@ void first_page_t::free_all_data_pages() {
     node_loc = cur_entry.get_next();
     cur_entry.reset(nullptr);
 
+    ut_ad(!local_mtr.conflicts_with(m_mtr));
     restart_mtr(&local_mtr);
   }
 
+  ut_ad(!local_mtr.conflicts_with(m_mtr));
   mtr_commit(&local_mtr);
 }
 
@@ -332,9 +334,11 @@ void first_page_t::free_all_index_pages() {
     set_next_page(next_page, &local_mtr);
     index_page.dealloc();
 
+    ut_ad(!local_mtr.conflicts_with(m_mtr));
     restart_mtr(&local_mtr);
   }
 
+  ut_ad(!local_mtr.conflicts_with(m_mtr));
   mtr_commit(&local_mtr);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -303,9 +303,11 @@ void first_page_t::free_all_data_pages() {`
`303`	`303`	`node_loc = cur_entry.get_next();`
`304`	`304`	`cur_entry.reset(nullptr);`
`305`	`305`
	`306`	`+ ut_ad(!local_mtr.conflicts_with(m_mtr));`
`306`	`307`	`restart_mtr(&local_mtr);`
`307`	`308`	`}`
`308`	`309`
	`310`	`+ ut_ad(!local_mtr.conflicts_with(m_mtr));`
`309`	`311`	`mtr_commit(&local_mtr);`
`310`	`312`	`}`
`311`	`313`
`@@ -332,9 +334,11 @@ void first_page_t::free_all_index_pages() {`
`332`	`334`	`set_next_page(next_page, &local_mtr);`
`333`	`335`	`index_page.dealloc();`
`334`	`336`
	`337`	`+ ut_ad(!local_mtr.conflicts_with(m_mtr));`
`335`	`338`	`restart_mtr(&local_mtr);`
`336`	`339`	`}`
`337`	`340`
	`341`	`+ ut_ad(!local_mtr.conflicts_with(m_mtr));`
`338`	`342`	`mtr_commit(&local_mtr);`
`339`	`343`	`}`
`340`	`344`