Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -4/+0 |
|\ | |||||
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -4/+0 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-03-03 | 1 | -4/+0 |
| * | | MDEV-11349 (1/2) Fix some clang 4.0 warnings | Marko Mäkelä | 2016-11-25 | 1 | -3/+0 |
* | | | MDEV-12270 Port MySQL 8.0 Bug#21141390 REMOVE UNUSED FUNCTIONS AND CONVERT GL... | Marko Mäkelä | 2017-03-17 | 1 | -0/+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 |
* | | | enum btr_latch_mode: Incorporate some flags. | Marko Mäkelä | 2017-03-09 | 1 | -4/+3 |
* | | | MDEV-11713 Optimize DBUG_PRINT and introduce DBUG_LOG | Marko Mäkelä | 2017-01-05 | 1 | -14/+2 |
* | | | MDEV-11690 Remove UNIV_HOTBACKUP | Marko Mäkelä | 2016-12-30 | 1 | -14/+0 |
* | | | MDEV-5800 InnoDB support for indexed vcols | Sergei Golubchik | 2016-12-12 | 1 | -6/+0 |
* | | | cleanup: InnoDB, various minor issues | Sergei Golubchik | 2016-12-12 | 1 | -1/+2 |
* | | | MDEV-11487 Revert InnoDB internal temporary tables from WL#7682 | Marko Mäkelä | 2016-12-09 | 1 | -27/+14 |
* | | | MDEV-11349 (1/2) Fix some clang 4.0 warnings | Marko Mäkelä | 2016-11-25 | 1 | -2/+0 |
* | | | Fixed compiler warnings and failing tests | Monty | 2016-10-05 | 1 | -1/+2 |
* | | | Merge branch '10.2' into bb-10.2-jan | Sergei Golubchik | 2016-09-19 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-08-25 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | - PXC#592: Tried closing fk-reference-table that was never opened. | Krunal Bauskar | 2016-08-21 | 1 | -2/+2 |
| | * | | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 1 | -12/+13 |
| | |\ \ | | | |/ | |||||
| | * | | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -6/+6 |
| | |\ \ | |||||
| | * \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -38/+33 |
| | |\ \ \ | |||||
| | * | | | | bzr merge -r4104..4120 codership/5.6/ | Nirbhay Choubey | 2014-08-12 | 1 | -15/+6 |
| | * | | | | bzr merge -r4065..4088 codership/5.6 | Nirbhay Choubey | 2014-05-21 | 1 | -0/+7 |
| | * | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -41/+10 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 1 | -0/+2 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | * bzr merge -r4027..4061 codership/5.6 | Nirbhay Choubey | 2014-03-26 | 1 | -0/+2 |
| | * | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -0/+4 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | Ported all remaining storage/innobase changes from lp:codership-mysql/5.6, up... | Seppo Jaakola | 2013-11-27 | 1 | -30/+103 |
| | * | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -197/+326 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+213 |
* | | | | | | | | | misc after-merge changes: | Sergei Golubchik | 2016-09-10 | 1 | -4/+0 |
* | | | | | | | | | Merge InnoDB 5.7 from mysql-5.7.14. | Jan Lindström | 2016-09-08 | 1 | -117/+196 |
* | | | | | | | | | Merge InnoDB 5.7 from mysql-5.7.9. | Jan Lindström | 2016-09-02 | 1 | -408/+875 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -12/+13 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Merge branch 'merge-innodb-5.6' into 10.0 | Sergei Golubchik | 2016-06-21 | 1 | -12/+13 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | 5.6.31 | Sergei Golubchik | 2016-06-21 | 1 | -12/+13 |
| | * | | | | | | move to storage/innobase | Sergei Golubchik | 2015-05-04 | 1 | -0/+2698 |
| | / / / / / | |||||
* | | | | | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -6/+6 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-6928: Add trx pointer to struct mtr_t | Jan Lindström | 2014-10-24 | 1 | -6/+6 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -27/+26 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | InnoDB 5.6.20 | Sergei Golubchik | 2014-09-11 | 1 | -20/+14 |
| | |_|_|/ | |/| | | | |||||
* | | | | | fixing embedded: WaaS. Wsrep as a Service. | Sergei Golubchik | 2014-10-01 | 1 | -3/+2 |
* | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+288 |
|/ / / / | |||||
* | | | | innodb 5.6.17 | Sergei Golubchik | 2014-05-07 | 1 | -41/+10 |
| |_|/ |/| | | |||||
* | | | MDEV-5574 Set AUTO_INCREMENT below max value of column. | Sergei Golubchik | 2014-02-01 | 1 | -0/+4 |
| |/ |/| | |||||
* | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -190/+317 |
|/ | |||||
* | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -0/+2604 |