summaryrefslogtreecommitdiff
path: root/storage/innobase/include/fil0crypt.ic
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
|\
| * Update FSF addressVicențiu Ciorbaru2019-05-111-1/+1
* | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-43/+5
|\ \ | |/
| * MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothingJan Lindström2017-03-141-32/+0
* | Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-2/+2
* | Merge InnoDB 5.7 from mysql-5.7.14.Jan Lindström2016-09-081-1/+1
* | Merge InnoDB 5.7 from mysql-5.7.9.Jan Lindström2016-09-021-1/+52
|/
* Add encryption key id to the API as a distinct conceptSergei Golubchik2015-04-091-4/+3
* Merge branch 'bb-10.1-jan-encryption' into bb-10.1-sergSergei Golubchik2015-04-091-58/+7
* Encryption cleanupJan Lindström2015-04-071-0/+51
* InnoDB/XtraDB Encryption cleanup.Jan Lindström2015-04-071-0/+69