diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:55:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-07-20 15:55:59 +0300 |
| commit | 4d4865de6f124ed0a97573bf784102077f7296e7 (patch) | |
| tree | 4b76dc03f45f1e795c78f899b59e161ba3b1b669 /storage/innobase/include/mtr0mtr.ic | |
| parent | 6c165b4bd69d1b9419758e8aa2b9c2958f015a98 (diff) | |
| parent | 4b959bd8df18a281248c7325a61f4a79ce7691da (diff) | |
| download | mariadb-git-4d4865de6f124ed0a97573bf784102077f7296e7.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/innobase/include/mtr0mtr.ic')
| -rw-r--r-- | storage/innobase/include/mtr0mtr.ic | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/mtr0mtr.ic b/storage/innobase/include/mtr0mtr.ic index 16777da1044..940d9952d84 100644 --- a/storage/innobase/include/mtr0mtr.ic +++ b/storage/innobase/include/mtr0mtr.ic @@ -43,7 +43,7 @@ mtr_t::memo_push(void* object, mtr_memo_type_t type) ut_ad(is_active()); ut_ad(object != NULL); ut_ad(type >= MTR_MEMO_PAGE_S_FIX); - ut_ad(type <= MTR_MEMO_SX_LOCK); + ut_ad(type <= MTR_MEMO_SPACE_X_LOCK); ut_ad(ut_is_2pow(type)); /* If this mtr has x-fixed a clean page then we set |