mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.1' into 10.2

Browse source
This commit is contained in:
Sergei Golubchik 2016-12-29 13:23:18 +01:00
commit 4a5d25c338
802 changed files with 37465 additions and 15102 deletions
Download patch file Download diff file Expand all files Collapse all files

5
storage/innobase/row/row0merge.cc
View file

@ -4701,10 +4701,7 @@ row_merge_build_indexes(
/* If tablespace is encrypted, allocate additional buffer for
encryption/decryption. */
if ((crypt_data && crypt_data->encryption == FIL_SPACE_ENCRYPTION_ON) ||
(srv_encrypt_tables &&
crypt_data && crypt_data->encryption == FIL_SPACE_ENCRYPTION_DEFAULT)) {
if (crypt_data && crypt_data->should_encrypt()) {
crypt_block = static_cast<row_merge_block_t*>(
alloc.allocate_large(3 * srv_sort_buf_size, &crypt_pfx));