summaryrefslogtreecommitdiff
path: root/sql/mf_iocache_encr.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\
| * Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
| |\
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
* | | Merge 10.2 into 10.3Marko Mäkelä2018-05-291-2/+2
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/10.1' into 10.2Monty2018-05-241-2/+2
| |\ \ | | |/
| | * MDEV-10259 mysqld crash with certain statement length and...sachin2018-05-221-2/+2
* | | Merge bb-10.2-ext into 10.3Marko Mäkelä2018-02-151-2/+3
|\ \ \ | |/ /
| * | Merge branch '10.1' into 10.2Sergei Golubchik2018-02-111-2/+3
| |\ \ | | |/
| | * MDEV-14868 MariaDB server crashes after using ROLLBACK TO when encrypt_tmp_fi...Sergei Golubchik2018-02-081-2/+3
* | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ...Vladislav Vaintroub2018-02-061-4/+4
|/ /
* | Fix several truncation and formatting warnings.Vladislav Vaintroub2017-10-031-2/+2
* | MDEV-13384 - misc Windows warnings fixedVladislav Vaintroub2017-09-281-3/+3
|/
* make encrypt-binlog and encrypt-tmp-files to fail if no encryptionSergei Golubchik2015-09-091-14/+17
* New encryption API. Piece-wise encryption.Sergei Golubchik2015-09-041-7/+9
* my_aes_get_size()Sergei Golubchik2015-06-021-1/+1
* just like tempfiles: use key id 2 for temp Aria tablesSergei Golubchik2015-06-021-2/+6
* MDEV-8126 encryption for temp filesSergei Golubchik2015-06-021-0/+254