diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-17 20:04:03 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-12-17 20:15:38 +0200 |
| commit | 7d245083a43e34d94822e580037727bdbb50b6f0 (patch) | |
| tree | efc1a1e7f2505079e24ac5d6814041a4394434e2 /storage/innobase/include/fil0crypt.h | |
| parent | 10e01b56f734d306897d2a59d091e6c421943e6b (diff) | |
| parent | 8c43f963882a9d5ac4e4289c8dd3dbcaeb40a0ce (diff) | |
| download | mariadb-git-7d245083a43e34d94822e580037727bdbb50b6f0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/include/fil0crypt.h')
| -rw-r--r-- | storage/innobase/include/fil0crypt.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/storage/innobase/include/fil0crypt.h b/storage/innobase/include/fil0crypt.h index 13b3ec4e37e..2cfc352c679 100644 --- a/storage/innobase/include/fil0crypt.h +++ b/storage/innobase/include/fil0crypt.h @@ -1,6 +1,6 @@ /***************************************************************************** Copyright (C) 2013, 2015, Google Inc. All Rights Reserved. -Copyright (c) 2015, 2017, MariaDB Corporation. +Copyright (c) 2015, 2018, 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 @@ -490,16 +490,9 @@ encrypted, or corrupted. @param[in,out] page page frame (checksum is temporarily modified) @param[in] page_size page size -@param[in] space tablespace identifier -@param[in] offset page number @return true if page is encrypted AND OK, false otherwise */ -UNIV_INTERN bool -fil_space_verify_crypt_checksum( - byte* page, - const page_size_t& page_size, - ulint space, - ulint offset) +fil_space_verify_crypt_checksum(const byte* page, const page_size_t& page_size) MY_ATTRIBUTE((warn_unused_result)); #endif /* fil0crypt_h */ |