Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove XtraDB | Marko Mäkelä | 2017-06-21 | 1 | -1565/+0 |
* | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-20 | 1 | -50/+238 |
|\ | |||||
| * | Merge branch 'merge-xtradb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-05-17 | 1 | -50/+285 |
| |\ | |||||
| | * | 5.6.36-82.0 | Vicențiu Ciorbaru | 2017-05-16 | 1 | -50/+285 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-04-21 | 1 | -11/+1 |
|\ \ \ | |/ / | |||||
| * | | MDEV-12534 Use atomic operations whenever available | Marko Mäkelä | 2017-04-20 | 1 | -11/+1 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -2/+3 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-xtradb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-03-05 | 1 | -2/+3 |
| |\ \ | | |/ | |||||
| | * | 5.6.35-80.0 | Vicențiu Ciorbaru | 2017-03-04 | 1 | -2/+3 |
* | | | MDEV-11520 after-merge fix for 10.1: Use sparse files. | Marko Mäkelä | 2017-02-22 | 1 | -9/+11 |
* | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-02-20 | 1 | -3/+6 |
|\ \ \ | |/ / | |||||
| * | | MDEV-11802 innodb.innodb_bug14676111 fails | Marko Mäkelä | 2017-02-20 | 1 | -2/+6 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -6/+6 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -8/+8 |
| |\ \ | | |/ | |||||
| | * | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 1 | -8/+8 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -6/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-xtradb-5.6' into 0.0 | Sergei Golubchik | 2016-06-21 | 1 | -6/+0 |
| |\ \ | | |/ | |||||
| | * | 5.6.30-76.3 | Sergei Golubchik | 2016-06-21 | 1 | -6/+0 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -12/+17 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -12/+17 |
| |\ \ | | |/ | |||||
| | * | 5.6.29-76.2 | Sergei Golubchik | 2016-04-26 | 1 | -12/+17 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -4/+10 |
|\ \ \ | |/ / | |||||
| * | | fix compile error on Windows | Vladislav Vaintroub | 2015-12-14 | 1 | -1/+1 |
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -3/+9 |
| |\ \ | | |/ | |||||
| | * | 5.6.27-76.0 | Sergei Golubchik | 2015-12-13 | 1 | -3/+9 |
| | * | 5.6.25-73.1 | Sergei Golubchik | 2015-08-01 | 1 | -4/+4 |
* | | | MDEV-8901: InnoDB: Punch hole is incorrecty done also to log files causing as... | Jan Lindström | 2015-10-06 | 1 | -7/+11 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | Apply fix for raw devices to XtraDB | josh4trunks | 2015-07-12 | 1 | -4/+4 |
* | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | XtraDB-5.6.23-72.1 | Sergei Golubchik | 2015-05-05 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | 5.6.23-72.1 | Sergei Golubchik | 2015-05-04 | 1 | -1/+1 |
| | * | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 1 | -0/+1324 |
* | | InnoDB/XtraDB Encryption cleanup. | Jan Lindström | 2015-04-07 | 1 | -54/+19 |
* | | Pass down the information should we encrypt the page at os0file.cc | Jan Lindström | 2015-02-10 | 1 | -10/+11 |
* | | Fixed XtraDB implementation of encryption and page encryption. | Jan Lindström | 2015-02-10 | 1 | -5/+7 |
* | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -4/+16 |
* | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | MDEV-7046: MySQL#74480 - Failing assertion: os_file_status(newpath, &exists, ... | Jan Lindström | 2014-11-25 | 1 | -0/+1 |
* | | MDEV-6648: InnoDB: Add support for 4K sector size if supported | Jan Lindström | 2014-10-29 | 1 | -0/+10 |
* | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | XtraDB 5.6.20-68.0 | Sergei Golubchik | 2014-09-11 | 1 | -1/+1 |
| * | MDEV-6318: MariaDB with XtraDB uses times more of IO events | Jan Lindström | 2014-07-04 | 1 | -2/+2 |
* | | Fiix random test failures on fil_decompress_page_2 function. | Jan Lindström | 2014-07-25 | 1 | -18/+27 |
* | | Fix compiler warnings. | Jan Lindström | 2014-05-23 | 1 | -2/+0 |
* | | MDEV-6246: Merge 10.0.10-FusionIO to 10.1. | Jan Lindström | 2014-05-22 | 1 | -18/+56 |
|\ \ | |/ |/| | |||||
| * | Merge lp:maria/10.0 up to mariadb-10.0.10 revision 4140. | Jan Lindström | 2014-04-17 | 1 | -0/+12 |
| |\ | |||||
| * | | Additional windows fixes. | Jan Lindström | 2014-03-03 | 1 | -10/+1 |
| * | | Fix typo. | Jan Lindström | 2014-03-03 | 1 | -1/+1 |
| * | | Fix windows compiler erros. | Jan Lindström | 2014-03-03 | 1 | -1/+11 |