post push fix for Bug#28663404

mysql · Oct 1, 2018 · c28ae9a · c28ae9a
1 parent 6112217
commit c28ae9a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
@@ -8828,7 +8828,7 @@ static void fil_tablespace_encryption_init(const fil_space_t *space) {
     is found on REDO Log.
     */
     if (fsp_is_file_per_table(space->id, space->flags) ||
-        (space->encryption_key == nullptr && space->encryption_iv == nullptr)) {
+        space->encryption_klen == 0) {
       err = fil_set_encryption(space->id, Encryption::AES, key.ptr, key.iv);
     }