Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-08-31 | 1 | -8/+76 |
|\ | |||||
| * | Fix test failures on embedded server. | Jan Lindström | 2017-08-31 | 1 | -1/+4 |
| * | Merge remote-tracking branch 'origin/10.0-galera' into 10.1 | Jan Lindström | 2017-08-21 | 1 | -7/+72 |
| |\ | |||||
| | * | MDEV-13471: Test failure on innodb.log_file_size,4k | Jan Lindström | 2017-08-10 | 1 | -10/+76 |
| | * | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -3/+3 |
| | |\ | |||||
| | * | | Merging InnoDB changes to xtradb (r3783..3808). | Nirbhay Choubey | 2014-03-26 | 1 | -18/+16 |
| | * | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -208/+199 |
| | |\ \ | |||||
| | * \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -0/+38 |
| | |\ \ \ \ | |||||
| | * | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+30 |
* | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-06 | 1 | -2/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | MDEV-9566 Prepare xtradb for xtrabackup | Vladislav Vaintroub | 2017-04-27 | 1 | -2/+3 |
* | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -3/+3 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -3/+3 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 1 | -3/+3 |
| | * | | | | | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 1 | -0/+722 |
| | / / / / | |||||
* | | | | | | Few improvements related to CPU cache line size and padding: | Alexey Kopytov | 2016-06-07 | 1 | -7/+7 |
|/ / / / / | |||||
* | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+33 |
| |_|_|/ |/| | | | |||||
* | | | | Percona-Server-5.6.14-rel62.0 merge | Sergei Golubchik | 2013-12-22 | 1 | -198/+184 |
| |_|/ |/| | | |||||
* | | | Percona-Server-5.5.33-rel31.1.tar.gz | Sergei Golubchik | 2013-09-07 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge with XtraDB as of Percona-Server-5.5.30-rel30.2 | Sergei Golubchik | 2013-05-08 | 1 | -0/+38 |
|/ | |||||
* | XtraDB from Percona-Server-5.5.28-rel29.1 | Sergei Golubchik | 2012-11-22 | 1 | -1/+15 |
* | XtraDB from Percona-Server-5.5.27-rel28.1 | Sergei Golubchik | 2012-09-05 | 1 | -3/+1 |
* | merged with XtraDB 1.1.8-26.0 | Sergei Golubchik | 2012-06-15 | 1 | -0/+6 |
* | Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5 | unknown | 2011-12-15 | 1 | -1/+12 |
* | merge with xtradb-5.5.15 | Sergei Golubchik | 2011-07-18 | 1 | -22/+27 |
* | Merge XtraDB from Percona server 5.1.49-12 into MariaDB. | unknown | 2010-09-03 | 1 | -0/+1 |
* | Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB. | unknown | 2010-08-04 | 1 | -1/+28 |
* | Merge XtraDB 10 into MariaDB. | unknown | 2010-04-28 | 1 | -3/+3 |
* | Merge XtraDB 9 into MariaDB. | unknown | 2010-01-15 | 1 | -0/+6 |
* | Merge XtraDB 8 into MariaDB. | unknown | 2009-11-13 | 1 | -218/+288 |
* | Merge latest XtraDB from lp:percona-xtradb into MariaDB. | unknown | 2009-06-11 | 1 | -1/+6 |
* | Import Percona XtraDB into the MariaDB source tree. | unknown | 2009-06-09 | 1 | -0/+555 |