Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 3 | -32/+11 |
|\ | |||||
| * | MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothing | Jan Lindström | 2017-03-14 | 1 | -21/+19 |
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -6/+0 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -6/+0 |
| | |\ | |||||
| | | * | Fix gcc 6.3.x compiler warnings. | Jan Lindström | 2017-02-16 | 1 | -5/+0 |
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-02-20 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix GCC 6.3.0 warnings. | Marko Mäkelä | 2017-02-16 | 1 | -0/+1 |
* | | | | MDEV-12270 Port MySQL 8.0 Bug#21141390 REMOVE UNUSED FUNCTIONS AND CONVERT GL... | Marko Mäkelä | 2017-03-17 | 1 | -120/+1 |
* | | | | MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_N... | Marko Mäkelä | 2017-03-17 | 1 | -5/+0 |
* | | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -1/+1 |
* | | | | MDEV-12121 Introduce build option WITH_INNODB_AHI to disable innodb_adaptive_... | Marko Mäkelä | 2017-03-03 | 1 | -7/+27 |
* | | | | Test recovery when a .ibd file is a directory. | Marko Mäkelä | 2017-02-06 | 1 | -4/+1 |
* | | | | MDEV-11849: Fix storage/innobase/* compile warnings | Jan Lindström | 2017-01-26 | 1 | -1/+0 |
* | | | | Merge 10.1 to 10.2. | Marko Mäkelä | 2017-01-19 | 4 | -193/+76 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-11623 MariaDB 10.1 fails to start datadir created with | Marko Mäkelä | 2017-01-15 | 1 | -1/+2 |
* | | | | MDEV-11202 InnoDB 10.1 -> 10.2 migration does not work | Marko Mäkelä | 2017-01-18 | 2 | -310/+274 |
* | | | | MDEV-11816 Disallow CREATE TEMPORARY TABLE…ROW_FORMAT=COMPRESSED | Marko Mäkelä | 2017-01-18 | 1 | -1/+4 |
* | | | | Remove MYSQL_TABLESPACES. | Marko Mäkelä | 2017-01-18 | 3 | -86/+19 |
* | | | | Remove MYSQL_COMPRESSION. | Marko Mäkelä | 2017-01-18 | 1 | -29/+1 |
* | | | | Remove MYSQL_ENCRYPTION. | Marko Mäkelä | 2017-01-18 | 2 | -421/+0 |
* | | | | Make atomic writes general | Sergei Golubchik | 2017-01-11 | 3 | -37/+4 |
* | | | | MDEV-11713 Optimize DBUG_PRINT and introduce DBUG_LOG | Marko Mäkelä | 2017-01-05 | 1 | -0/+6 |
* | | | | MDEV-11690 Remove UNIV_HOTBACKUP | Marko Mäkelä | 2016-12-30 | 4 | -68/+5 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2016-12-30 | 1 | -4/+6 |
|\ \ \ \ | |/ / / | |||||
* | | | | Remove dead references to NO_FALLOCATE. | Marko Mäkelä | 2016-12-30 | 2 | -23/+13 |
* | | | | MDEV-11679 Remove redundant function fsp_header_get_crypt_offset() | Marko Mäkelä | 2016-12-29 | 2 | -61/+9 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 2 | -2/+4 |
|\ \ \ \ | |/ / / | |||||
* | | | | MDEV-11630 Call mutex_free() before freeing the mutex list | Marko Mäkelä | 2016-12-22 | 1 | -13/+8 |
* | | | | MDEV-11585 Hard-code the shared InnoDB temporary tablespace ID at -1 | Marko Mäkelä | 2016-12-19 | 2 | -43/+21 |
* | | | | Merge InnoDB 5.7 from mysql-5.7.14. | Jan Lindström | 2016-09-08 | 4 | -153/+643 |
* | | | | Merge InnoDB 5.7 from mysql-5.7.9. | Jan Lindström | 2016-09-02 | 4 | -1676/+3939 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -18/+21 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -18/+21 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2016-06-21 | 1 | -18/+21 |
| | |\ \ | |||||
| | | * | | 5.6.31 | Sergei Golubchik | 2016-06-21 | 1 | -18/+21 |
* | | | | | Fixed compiler warnings and test failures found by buildbot | Monty | 2016-06-22 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -6/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'merge/merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -4/+22 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.6.28 | Sergei Golubchik | 2015-12-13 | 1 | -4/+22 |
| * | | | Fixed failing test cases and compiler warnings found by buildbot | Monty | 2015-11-24 | 1 | -2/+2 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -0/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-8386: MARIADB creates very big tmp file > 351Gb. Started happening after... | Jan Lindström | 2015-07-14 | 1 | -0/+14 |
| |/ / | |||||
* | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -39/+1 |
|\ \ \ | |/ / | |||||
| * | | 5.6.24 | Sergei Golubchik | 2015-05-04 | 1 | -39/+1 |
| * | | move to storage/innobase | Sergei Golubchik | 2015-05-04 | 1 | -0/+4123 |
| / | |||||
* | | InnoDB/XtraDB Encryption cleanup. | Jan Lindström | 2015-04-07 | 1 | -0/+1 |
* | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -0/+63 |
* | | MDEV-5574 Set AUTO_INCREMENT below max value of column. | Sergei Golubchik | 2014-02-01 | 1 | -1/+6 |
* | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -146/+104 |
* | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -316/+162 |
|/ |