diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-06 16:22:09 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-06 16:22:09 +0300 |
| commit | 57d4a242dac0238dd63ac05cd9d65a38d75a5d5f (patch) | |
| tree | 323a71a864c38fe00502bd95926b4d05ab6854d6 /storage/innobase/include/btr0bulk.h | |
| parent | e097abfa662751cc337febad9d8584159f23cc92 (diff) | |
| parent | 7e39470e337aeeab4ee3e73336c2fff88609529f (diff) | |
| download | mariadb-git-57d4a242dac0238dd63ac05cd9d65a38d75a5d5f.tar.gz | |
Merge 10.7 into 10.8
Diffstat (limited to 'storage/innobase/include/btr0bulk.h')
| -rw-r--r-- | storage/innobase/include/btr0bulk.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/btr0bulk.h b/storage/innobase/include/btr0bulk.h index 943836f8759..9fcea86d95d 100644 --- a/storage/innobase/include/btr0bulk.h +++ b/storage/innobase/include/btr0bulk.h @@ -1,7 +1,7 @@ /***************************************************************************** Copyright (c) 2014, 2015, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2019, 2020, 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 @@ -170,7 +170,7 @@ public: inline void release(); /** Start mtr and latch block */ - inline dberr_t latch(); + inline void latch(); /** Check if required space is available in the page for the rec to be inserted. We check fill factor & padding here. |