diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-10-27 14:51:10 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2016-10-29 10:09:06 +0300 |
| commit | 885577fb10cba63a4a140bd91257a3cd2b402159 (patch) | |
| tree | 64ad9e60c526db676f470847aa6b1f1eabf510ec /mysql-test/std_data | |
| parent | bc323727de312b32e80ae9590e2346414746a594 (diff) | |
| download | mariadb-git-885577fb10cba63a4a140bd91257a3cd2b402159.tar.gz | |
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.
Diffstat (limited to 'mysql-test/std_data')
| -rw-r--r-- | mysql-test/std_data/keys2.txt | 1 |
1 files changed, 1 insertions, 0 deletions
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 |