database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-08-17 11:32:16 +02:00
parent a4885dde4c 48fe832650
commit cb1e76e4de
360 changed files with 40976 additions and 2803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/suite/encryption/r/second_plugin-12863.result Normal file
View File

@ -0,0 +1,7 @@
call mtr.add_suppression('debug.key.management');
install soname 'debug_key_management';
ERROR HY000: Can't initialize function 'debug_key_management'; Plugin initialization function failed.
create table t1 (a varchar(255)) engine=innodb encrypted=yes;
create table t2 (a varchar(255)) engine=innodb;
create table t3 (a varchar(255)) engine=innodb encrypted=no;
drop table t1, t2, t3;

1
mysql-test/suite/encryption/t/innochecksum.test
View File

@ -2,7 +2,6 @@
# MDEV-8773: InnoDB innochecksum does not work with encrypted or page compressed tables
#
--source include/innodb_page_size_small.inc
# Don't test under embedded as we restart server
-- source include/not_embedded.inc
# Require InnoDB

16
mysql-test/suite/encryption/t/second_plugin-12863.test Normal file
View File

@ -0,0 +1,16 @@
#
# MDEV-12863 No table can be created after second encryption plugin attempted to load
#
--source include/have_innodb.inc
--source include/have_file_key_management_plugin.inc
call mtr.add_suppression('debug.key.management');
--error 1123
install soname 'debug_key_management';
create table t1 (a varchar(255)) engine=innodb encrypted=yes;
create table t2 (a varchar(255)) engine=innodb;
create table t3 (a varchar(255)) engine=innodb encrypted=no;
drop table t1, t2, t3;