Commit 730f6c91 authored by Thirunarayanan Balathandayuthapani's avatar Thirunarayanan Balathandayuthapani Committed by Marko Mäkelä

MDEV-16779 Assertion !rw_lock_own failed upon purge

This is a regression caused by the fix of MDEV-15855.

purge_vcol_info_t::set_used(): Add a missing condition.

row_purge_poss_sec(): Invoke set_used() in order to
have !is_first_fetch() when retrying.
parent b660261b
...@@ -92,8 +92,10 @@ struct purge_vcol_info_t ...@@ -92,8 +92,10 @@ struct purge_vcol_info_t
return; return;
} }
if (!used) {
first_use = used = true; first_use = used = true;
} }
}
/** Check whether it fetches mariadb table for the first time. /** Check whether it fetches mariadb table for the first time.
@return true if first time tries to open mariadb table. */ @return true if first time tries to open mariadb table. */
......
...@@ -345,6 +345,7 @@ row_purge_poss_sec( ...@@ -345,6 +345,7 @@ row_purge_poss_sec(
if (node->vcol_info.is_first_fetch()) { if (node->vcol_info.is_first_fetch()) {
if (node->vcol_info.mariadb_table) { if (node->vcol_info.mariadb_table) {
node->vcol_info.set_used();
goto retry_purge_sec; goto retry_purge_sec;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment