diff options
| author | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:03:01 +0300 |
|---|---|---|
| committer | Nikita Malyavin <nikitamalyavin@gmail.com> | 2021-05-05 23:03:01 +0300 |
| commit | 509e4990af4d99e9d3c790eabe1c1705ae910b55 (patch) | |
| tree | 02d4ca9409711baef3ec163adc402f2c380df7c8 /storage/innobase/row | |
| parent | 0cc811c633d1fe5290b10fa49fad0a4b889383fa (diff) | |
| parent | 4f143a88bcb36e94e9edba8a3c5b4a350dcd9bf9 (diff) | |
| download | mariadb-git-509e4990af4d99e9d3c790eabe1c1705ae910b55.tar.gz | |
Merge branch bb-10.3-release into bb-10.4-release
Diffstat (limited to 'storage/innobase/row')
| -rw-r--r-- | storage/innobase/row/row0purge.cc | 20 | ||||
| -rw-r--r-- | storage/innobase/row/row0vers.cc | 1 |
2 files changed, 21 insertions, 0 deletions
diff --git a/storage/innobase/row/row0purge.cc b/storage/innobase/row/row0purge.cc index cbf4ddce279..a4fc2db1529 100644 --- a/storage/innobase/row/row0purge.cc +++ b/storage/innobase/row/row0purge.cc @@ -46,6 +46,7 @@ Created 3/14/1997 Heikki Tuuri #include "handler.h" #include "ha_innodb.h" #include "fil0fil.h" +#include "debug_sync.h" /************************************************************************* IMPORTANT NOTE: Any operation that generates redo MUST check that there @@ -1311,6 +1312,25 @@ row_purge_step( node->start(); +#ifdef UNIV_DEBUG + srv_slot_t *slot = thr->thread_slot; + ut_ad(slot); + + rw_lock_x_lock(&slot->debug_sync_lock); + while (UT_LIST_GET_LEN(slot->debug_sync)) { + srv_slot_t::debug_sync_t *sync = + UT_LIST_GET_FIRST(slot->debug_sync); + bool result = debug_sync_set_action(current_thd, + sync->str, + strlen(sync->str)); + ut_a(!result); + + UT_LIST_REMOVE(slot->debug_sync, sync); + ut_free(sync); + } + rw_lock_x_unlock(&slot->debug_sync_lock); +#endif + if (!(node->undo_recs == NULL || ib_vector_is_empty(node->undo_recs))) { trx_purge_rec_t*purge_rec; diff --git a/storage/innobase/row/row0vers.cc b/storage/innobase/row/row0vers.cc index cde4e9e7b89..a5ef82405d4 100644 --- a/storage/innobase/row/row0vers.cc +++ b/storage/innobase/row/row0vers.cc @@ -466,6 +466,7 @@ row_vers_build_clust_v_col( vcol_info->set_used(); maria_table = vcol_info->table(); } + DEBUG_SYNC(current_thd, "ib_clust_v_col_before_row_allocated"); ib_vcol_row vc(NULL); byte *record = vc.record(thd, index, &maria_table); |