Marko Mäkelä 4e7b382d31 Merge 10.1 to 10.2 ... Most conflicts are related to the MDEV-11638 InnoDB shutdown refactoring.		2017-01-05 10:48:03 +02:00
..
include	MDEV-9099: Test encryption.innodb_encryption_discard_import fails on buildbot	2016-10-29 10:09:06 +03:00
r	Merge 10.1 to 10.2	2017-01-05 10:48:03 +02:00
t	Merge 10.1 to 10.2	2017-01-05 10:48:03 +02:00
disabled.def	Merge 10.1 to 10.2	2017-01-05 10:48:03 +02:00
suite.pm	move encryption tests to a dedicate suite	2015-05-13 14:27:16 +02:00