diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-28 12:22:32 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-28 12:22:32 +0300 |
| commit | f740d23ce6574bf57449aa48b22d6345f35ad2c0 (patch) | |
| tree | 85eb18f1464b3dc76e571354401a2072cb8c8ba0 /storage/innobase/include/fil0crypt.h | |
| parent | e21c15a7e626b5c01d9770d82aaed56053c7baef (diff) | |
| parent | 97e0c260dc8273f809915505f8dfdccd948b4b99 (diff) | |
| download | mariadb-git-f740d23ce6574bf57449aa48b22d6345f35ad2c0.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase/include/fil0crypt.h')
| -rw-r--r-- | storage/innobase/include/fil0crypt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/include/fil0crypt.h b/storage/innobase/include/fil0crypt.h index 831d61445d8..497595bab7c 100644 --- a/storage/innobase/include/fil0crypt.h +++ b/storage/innobase/include/fil0crypt.h @@ -116,10 +116,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(LATCH_ID_FIL_CRYPT_DATA_MUTEX, &mutex); |