diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-16 16:55:16 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-09-16 21:15:38 +0300 |
| commit | 836d4e74d9416a1af839f8068c5a07bee6f4b71e (patch) | |
| tree | 39cee03b68cab0b0b8870c700be27c424e7ecc22 /storage/innobase | |
| parent | f24d36ae1e91cb98462139dfae41211b9e9a3a2c (diff) | |
| download | mariadb-git-836d4e74d9416a1af839f8068c5a07bee6f4b71e.tar.gz | |
Write proper tests for MDEV-12634: Uninitialised ROW_MERGE_RESERVE_SIZE bytes
Introduce innodb_encrypt_log.combinations and prove that
the encryption and decryption take place during both
online ADD INDEX (WL#5266) and online table-rebuilding ALTER (WL#6625).
Diffstat (limited to 'storage/innobase')
| -rw-r--r-- | storage/innobase/row/row0merge.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc index a91c0f67218..62dc98a3e30 100644 --- a/storage/innobase/row/row0merge.cc +++ b/storage/innobase/row/row0merge.cc @@ -4037,10 +4037,6 @@ row_merge_build_indexes( /* Now we have files containing index entries ready for sorting and inserting. */ - DBUG_EXECUTE_IF( - "ib_merge_wait_after_read", - os_thread_sleep(20000000);); /* 20 sec */ - for (i = 0; i < n_indexes; i++) { dict_index_t* sort_idx = indexes[i]; |