Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-04-03 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -1/+1 |
| |\ | |||||
| | * | 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 remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-03-24 | 1 | -9/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_N... | Marko Mäkelä | 2017-03-17 | 1 | -2/+0 |
| * | | | Fix some compilation warnings. | Marko Mäkelä | 2017-03-13 | 1 | -7/+4 |
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-03-09 | 1 | -13/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -13/+13 |
* | | | | Remove innodb_use_trim, innodb_instrument_semaphores. | Marko Mäkelä | 2017-03-01 | 1 | -6/+4 |
|/ / / | |||||
* | | | MDEV-11802 innodb.innodb_bug14676111 fails | Marko Mäkelä | 2017-02-20 | 1 | -1/+5 |
* | | | Replace fil_node_t::is_open with fil_node_t::is_open(). | Marko Mäkelä | 2017-01-25 | 1 | -1/+1 |
* | | | Fix compiler error on x86. | Jan Lindström | 2017-01-25 | 1 | -1/+1 |
* | | | Fix compiler error on x86. | Jan Lindström | 2017-01-25 | 1 | -1/+1 |
* | | | MDEV-11254: innodb-use-trim has no effect in 10.2 | Jan Lindström | 2017-01-24 | 1 | -26/+177 |
* | | | Remove MYSQL_COMPRESSION. | Marko Mäkelä | 2017-01-18 | 1 | -301/+4 |
* | | | Remove MYSQL_ENCRYPTION. | Marko Mäkelä | 2017-01-18 | 1 | -254/+0 |
* | | | MDEV-11690 Remove UNIV_HOTBACKUP | Marko Mäkelä | 2016-12-30 | 1 | -13/+0 |
* | | | Merge InnoDB 5.7 from mysql-5.7.14. | Jan Lindström | 2016-09-08 | 1 | -50/+308 |
* | | | Merge InnoDB 5.7 from mysql-5.7.9. | Jan Lindström | 2016-09-02 | 1 | -950/+1373 |
|/ / | |||||
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -6/+6 |
|\ \ | |/ | |||||
| * | Merge branch 'merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2016-06-21 | 1 | -8/+8 |
| |\ | |||||
| | * | 5.6.31 | Sergei Golubchik | 2016-06-21 | 1 | -8/+8 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -4/+1 |
|\ \ \ | |/ / | |||||
* | | | MDEV-9678: Data Directory bug | Jan Lindström | 2016-03-22 | 1 | -2/+5 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -12/+17 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2016-02-16 | 1 | -12/+17 |
| |\ \ | | |/ | |||||
| | * | 5.6.29 | Sergei Golubchik | 2016-02-16 | 1 | -12/+17 |
* | | | MDEV-8901: InnoDB: Punch hole is incorrecty done also to log files causing as... | Jan Lindström | 2015-10-06 | 1 | -7/+11 |
* | | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -4/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2015-06-16 | 1 | -4/+4 |
| |\ \ | | |/ | |||||
| | * | 5.6.25 | Sergei Golubchik | 2015-06-16 | 1 | -4/+4 |
| | * | move to storage/innobase | Sergei Golubchik | 2015-05-04 | 1 | -0/+1289 |
* | | InnoDB/XtraDB Encryption cleanup. | Jan Lindström | 2015-04-07 | 1 | -52/+17 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-03-07 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | innodb 5.6.23 | Sergei Golubchik | 2015-02-18 | 1 | -1/+1 |
* | | Pass down the information should we encrypt the page at os0file.cc | Jan Lindström | 2015-02-10 | 1 | -9/+11 |
* | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -6/+23 |
* | | 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 | -1/+1 |
|\ \ | |/ | |||||
| * | InnoDB 5.6.20 | Sergei Golubchik | 2014-09-11 | 1 | -1/+1 |
* | | Fiix random test failures on fil_decompress_page_2 function. | Jan Lindström | 2014-07-25 | 1 | -10/+19 |
* | | 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 | -21/+54 |
|\ \ | |/ |/| | |||||
| * | Fixed bug on free buffer space calculation when LZO is used. | Jan Lindström | 2014-04-23 | 1 | -1/+3 |
| * | Merge lp:maria/10.0 up to mariadb-10.0.10 revision 4140. | Jan Lindström | 2014-04-17 | 1 | -0/+11 |
| |\ | |||||
| * | | Additional windows fixes. | Jan Lindström | 2014-03-03 | 1 | -10/+1 |