database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-03-30 12:48:42 +02:00
parent 9ec8500998 a00517ac97
commit da4d71d10d
1708 changed files with 29631 additions and 15718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/encryption/r/innodb-missing-key.result
View File

@@ -1,6 +1,4 @@
call mtr.add_suppression("InnoDB: Block in space_id .* in file test/.* encrypted");
call mtr.add_suppression("InnoDB: However key management plugin or used key_id .* is not found or used encryption algorithm or method does not match.");
call mtr.add_suppression("InnoDB: Marking tablespace as missing. You may drop this table or install correct key management plugin and key file.");
call mtr.add_suppression("InnoDB: The page .* in file test/t. cannot be decrypted");
# Start server with keys2.txt
CREATE TABLE t1(a int not null primary key auto_increment, b varchar(128)) engine=innodb ENCRYPTED=YES ENCRYPTION_KEY_ID=19;