diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-05-07 23:51:18 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-05-07 23:51:18 +0400 |
| commit | 314350a722e65081472113c53657ad239f3bef72 (patch) | |
| tree | 8b72cd2bf6f2b352b379dbfcbb1a99a48c422335 /storage/innobase/include/trx0rseg.h | |
| parent | 39e31671935bc019f556e945571f37d2d1f3a77f (diff) | |
| parent | c619fbeafe8d5019e37fcb7ba5e1a6ce2d431270 (diff) | |
| download | mariadb-git-314350a722e65081472113c53657ad239f3bef72.tar.gz | |
Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3
Diffstat (limited to 'storage/innobase/include/trx0rseg.h')
| -rw-r--r-- | storage/innobase/include/trx0rseg.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/include/trx0rseg.h b/storage/innobase/include/trx0rseg.h index 95774cbf476..4c162526384 100644 --- a/storage/innobase/include/trx0rseg.h +++ b/storage/innobase/include/trx0rseg.h @@ -200,7 +200,10 @@ struct trx_rseg_t { bool is_persistent() const { ut_ad(space == SRV_TMP_SPACE_ID - || space <= srv_undo_tablespaces); + || space <= TRX_SYS_MAX_UNDO_SPACES); + ut_ad(space == SRV_TMP_SPACE_ID + || space <= srv_undo_tablespaces_active + || !srv_was_started); return(space != SRV_TMP_SPACE_ID); } }; |