Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -43/+5 |
|\ | |||||
| * | MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothing | Jan Lindström | 2017-03-14 | 1 | -32/+0 |
* | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -2/+2 |
* | | Merge InnoDB 5.7 from mysql-5.7.14. | Jan Lindström | 2016-09-08 | 1 | -1/+1 |
* | | Merge InnoDB 5.7 from mysql-5.7.9. | Jan Lindström | 2016-09-02 | 1 | -1/+52 |
|/ | |||||
* | Add encryption key id to the API as a distinct concept | Sergei Golubchik | 2015-04-09 | 1 | -4/+3 |
* | Merge branch 'bb-10.1-jan-encryption' into bb-10.1-serg | Sergei Golubchik | 2015-04-09 | 1 | -58/+7 |
* | Encryption cleanup | Jan Lindström | 2015-04-07 | 1 | -0/+51 |
* | InnoDB/XtraDB Encryption cleanup. | Jan Lindström | 2015-04-07 | 1 | -0/+69 |