summaryrefslogtreecommitdiff
path: root/storage/innobase/include/trx0rseg.h
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/include/trx0rseg.h')
-rw-r--r--storage/innobase/include/trx0rseg.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/storage/innobase/include/trx0rseg.h b/storage/innobase/include/trx0rseg.h
index 3078aa8faf1..48c5133644c 100644
--- a/storage/innobase/include/trx0rseg.h
+++ b/storage/innobase/include/trx0rseg.h
@@ -203,9 +203,17 @@ struct trx_rseg_t {
bool is_persistent() const
{
ut_ad(space == SRV_TMP_SPACE_ID
- || space <= TRX_SYS_MAX_UNDO_SPACES);
+ || space == TRX_SYS_SPACE
+ || (srv_undo_space_id_start > 0
+ && space >= srv_undo_space_id_start
+ && space <= srv_undo_space_id_start
+ + TRX_SYS_MAX_UNDO_SPACES));
ut_ad(space == SRV_TMP_SPACE_ID
- || space <= srv_undo_tablespaces_active
+ || space == TRX_SYS_SPACE
+ || (srv_undo_space_id_start > 0
+ && space >= srv_undo_space_id_start
+ && space <= srv_undo_space_id_start
+ + srv_undo_tablespaces_active)
|| !srv_was_started);
return(space != SRV_TMP_SPACE_ID);
}