mariadb/storage/innobase/handler
Sergei Golubchik 5dffda3ccc Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg
With changes:

* update tests to pass (new encryption/encryption_key_id syntax).
* not merged the code that makes engine aware of the encryption mode
  (CRYPT_SCHEME_1_CBC, CRYPT_SCHEME_1_CTR, storing it on disk, etc),
  because now the encryption plugin is handling it.
* compression+encryption did not work in either branch before the
  merge - and it does not work after the merge. it might be more
  broken after the merge though - some of that code was not merged.
* page checksumming code was not moved (moving of page checksumming
  from fil_space_encrypt() to fil_space_decrypt was not merged).
* restored deleted lines in buf_page_get_frame(), otherwise
  innodb_scrub test failed.
2015-04-09 19:27:40 +02:00
..
ha_innodb.cc Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg 2015-04-09 19:27:40 +02:00
ha_innodb.h InnoDB/XtraDB Encryption cleanup 2015-04-07 23:44:57 +02:00
handler0alter.cc InnoDB/XtraDB Encryption cleanup 2015-04-07 23:44:57 +02:00
i_s.cc Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg 2015-04-09 19:27:40 +02:00
i_s.h MDEV-7109: Add support for INFORMATION_SCHEMA.INNODB_SEMAPHORE_WAITS 2015-02-21 21:45:16 +02:00