diff options
Diffstat (limited to 'storage/xtradb/fil/fil0fil.cc')
| -rw-r--r-- | storage/xtradb/fil/fil0fil.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/xtradb/fil/fil0fil.cc b/storage/xtradb/fil/fil0fil.cc index 73e6f514216..9336abf3656 100644 --- a/storage/xtradb/fil/fil0fil.cc +++ b/storage/xtradb/fil/fil0fil.cc @@ -6982,7 +6982,7 @@ fil_space_get_crypt_data( /****************************************************************** Get crypt data for a tablespace */ UNIV_INTERN -void +fil_space_crypt_t* fil_space_set_crypt_data( /*==================*/ ulint id, /*!< in: space id */ @@ -6990,6 +6990,7 @@ fil_space_set_crypt_data( { fil_space_t* space; fil_space_crypt_t* free_crypt_data = NULL; + fil_space_crypt_t* ret_crypt_data = NULL; ut_ad(fil_system); @@ -7008,9 +7009,11 @@ fil_space_set_crypt_data( mutex_exit(&fil_system->mutex); fil_space_merge_crypt_data(space->crypt_data, crypt_data); + ret_crypt_data = space->crypt_data; free_crypt_data = crypt_data; } else { space->crypt_data = crypt_data; + ret_crypt_data = space->crypt_data; mutex_exit(&fil_system->mutex); } } else { @@ -7026,4 +7029,6 @@ fil_space_set_crypt_data( */ fil_space_destroy_crypt_data(&free_crypt_data); } + + return ret_crypt_data; } |