6 Commits

Author	SHA1	Message	Date
Jan Lindström	ee768d8e0e	MDEV-9640: Add used key_id to INFORMATION_SCHEMA.INNODB_TABLESPACES_ENCRYPTION	2016-03-18 11:48:49 +02:00
Sergei Golubchik	a5679af1b1	Merge branch '10.0' into 10.1	2016-02-23 21:35:05 +01:00
Sergei Golubchik	87c306802b	update test results	2015-11-20 09:16:36 +01:00
Jan Lindström	c0b7bf2625	MDEV-8683: Bunch of tests fail in buildbot on new InnoDB variables	2015-08-26 18:07:34 +03:00
Sergei Golubchik	5091a4ba75	Merge tag 'mariadb-10.0.19' into 10.1	2015-06-01 15:51:25 +02:00
Jan Lindström	bad81f23f6	MDEV-8046: Server crashes in pfs_mutex_enter_func on select from I_S.INNODB_TABLESPACES_ENCRYPTION if InnoDB is disabled ... Problem was that information schema tables innodb_tablespaces_encryption and innodb_tablespaces_scrubbing where missing required check is InnoDB enabled or not.	2015-05-06 15:16:28 +03:00