mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 13:02:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

row_purge_poss_sec(): Add debug instrumentation

Browse source 
This helped fix MDEV-16779.
This commit is contained in:
Marko Mäkelä 2018-07-23 18:23:54 +03:00
parent c5ba13dda0
commit 9d1f3bf2e9
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
storage/innobase/row/row0purge.cc
View file

@ -323,6 +323,8 @@ row_purge_poss_sec(
if (store_cur) {
row_purge_store_vsec_cur(node, index, sec_pcur, sec_mtr);
ut_ad(sec_mtr->has_committed()
== node->vcol_info.is_requested());
/* The PRIMARY KEY value was not found in the clustered
index. The secondary index record found. We can purge
@ -346,7 +348,15 @@ retry_purge_sec:
if (node->vcol_info.is_first_fetch()) {
ut_ad(store_cur);
if (node->vcol_info.table()) {
const TABLE* t= node->vcol_info.table();
DBUG_LOG("purge", "retry " << t
<< (is_tree ? " tree" : " leaf")
<< index->name << "," << index->table->name
<< ": " << rec_printer(entry).str());
ut_ad(mtr.has_committed());
if (t) {
node->vcol_info.set_used();
goto retry_purge_sec;
}
@ -360,9 +370,11 @@ retry_purge_sec:
if (node->found_clust) {
btr_pcur_commit_specify_mtr(&node->pcur, &mtr);
} else {
mtr_commit(&mtr);
mtr.commit();
}
ut_ad(mtr.has_committed());
if (store_cur && !row_purge_restore_vsec_cur(
node, index, sec_pcur, sec_mtr, is_tree)) {
return false;