From 885577fb10cba63a4a140bd91257a3cd2b402159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Lindstr=C3=B6m?= <jan.lindstrom@mariadb.com>
Date: Thu, 27 Oct 2016 14:51:10 +0300
Subject: MDEV-11004: Unable to start (Segfault or os error 2) when encryption
 key missing

Two problems:

(1) When pushing warning to sql-layer we need to check that thd != NULL
to avoid NULL-pointer reference.

(2) At tablespace key rotation if used key_id is not found from
encryption plugin tablespace should not be rotated.
---
 mysql-test/std_data/keys2.txt | 1 +
 1 file changed, 1 insertion(+)

(limited to 'mysql-test/std_data')

diff --git a/mysql-test/std_data/keys2.txt b/mysql-test/std_data/keys2.txt
index aa1600b894d..5b98fbeebd2 100644
--- a/mysql-test/std_data/keys2.txt
+++ b/mysql-test/std_data/keys2.txt
@@ -4,3 +4,4 @@
 4;205379930183490D3BECA139BDF4DB5B
 5;E2D944D5D837A1DCB22FF7FD397892EE
 6;BAFE99B0BB87F2CD33A6AF26A11F6BD1
+19;678D6B0063824BACCE33224B385104B35F30FF5749F0EBC030A0955DBC7FAC34
-- 
cgit v1.2.1