Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Update FSF address | Michal Schorm | 2019-05-10 | 1 | -1/+1 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
* | | | Fixed compiler warnings and test failures found by buildbot | Monty | 2016-06-24 | 1 | -1/+1 |
|/ / | |||||
* | | New encryption API. Piece-wise encryption. | Sergei Golubchik | 2015-09-04 | 1 | -1/+1 |
* | | Identical key derivation code in XtraDB/InnoDB/Aria | Sergei Golubchik | 2015-05-15 | 1 | -0/+27 |
* | | Add encryption key id to the API as a distinct concept | Sergei Golubchik | 2015-04-09 | 1 | -1/+1 |
* | | renames to follow single consistent naming style | Sergei Golubchik | 2015-04-09 | 1 | -2/+2 |
* | | remove wrappers in encryption_keys.cc | Sergei Golubchik | 2015-04-09 | 1 | -28/+4 |
* | | encryption plugin controls the encryption | Sergei Golubchik | 2015-04-09 | 1 | -0/+35 |
|/ | |||||
* | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -0/+2 |
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -0/+7 |
|\ | |||||
| * | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -0/+7 |
* | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -6/+18 |
|/ | |||||
* | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -2/+2 |
* | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 1 | -4/+2 |
* | WL#3072 Maria recovery. | unknown | 2007-10-03 | 1 | -0/+106 |