diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-26 18:59:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-04-26 18:59:40 +0300 |
| commit | 638afc4acf86b32b74b3b37314f2dbd048062814 (patch) | |
| tree | 7de9e7edb4f45cef5aa8664235270f96bd7eae07 /storage/innobase/include/buf0types.h | |
| parent | ee5966c75404fd4e35dde52f1ebb78e3e20ebf77 (diff) | |
| parent | 2c005261cb7ee12e4da63d7769ba1ebe8f8cdc9f (diff) | |
| download | mariadb-git-638afc4acf86b32b74b3b37314f2dbd048062814.tar.gz | |
Merge 10.6 into 10.7
Diffstat (limited to 'storage/innobase/include/buf0types.h')
| -rw-r--r-- | storage/innobase/include/buf0types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/buf0types.h b/storage/innobase/include/buf0types.h index 6bc46dbbc04..38df7cbe462 100644 --- a/storage/innobase/include/buf0types.h +++ b/storage/innobase/include/buf0types.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. -Copyright (c) 2019, 2021, MariaDB Corporation. +Copyright (c) 2019, 2022, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -131,7 +131,7 @@ public: /** Retrieve the fold value. @return fold value */ - ulint fold() const { return (space() << 20) + space() + page_no(); } + ulint fold() const { return (ulint{space()} << 20) + space() + page_no(); } /** Reset the page number only. @param[in] page_no page number */ |