diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 16:06:05 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 17:47:05 +0300 |
| commit | d23eb8e6d27dfc6450465baa2897db5ebd334ea6 (patch) | |
| tree | c40e53f53155665bb77fd9bd7b8ba636890b44a5 /storage/innobase/include/fil0crypt.h | |
| parent | aafaf05a47221e035039d75a8f62dbda2379d044 (diff) | |
| download | mariadb-git-d23eb8e6d27dfc6450465baa2897db5ebd334ea6.tar.gz | |
Follow-up to MDEV-12488: Fix some type mismatch in header files
This reduces the number of compilation warnings on Windows.
Diffstat (limited to 'storage/innobase/include/fil0crypt.h')
| -rw-r--r-- | storage/innobase/include/fil0crypt.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/include/fil0crypt.h b/storage/innobase/include/fil0crypt.h index cfc2d850883..e7e9676aa3a 100644 --- a/storage/innobase/include/fil0crypt.h +++ b/storage/innobase/include/fil0crypt.h @@ -109,7 +109,7 @@ struct fil_space_crypt_t : st_encryption_scheme The object is expected to be placed in a buffer that has been zero-initialized. */ fil_space_crypt_t( - ulint new_type, + uint new_type, uint new_min_key_version, uint new_key_id, fil_encryption_t new_encryption) @@ -117,10 +117,10 @@ struct fil_space_crypt_t : st_encryption_scheme min_key_version(new_min_key_version), page0_offset(0), encryption(new_encryption), - key_found(), + mutex(), + key_found(new_min_key_version), rotate_state() { - key_found = new_min_key_version; key_id = new_key_id; my_random_bytes(iv, sizeof(iv)); mutex_create(fil_crypt_data_mutex_key, |