| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove XtraDB | Marko Mäkelä | 2017-06-21 | 2 | -3572/+0 |
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-19 | 1 | -2/+4 |
| |\ | |||||
| | * | Fix some __attribute__((nonnull)) misuse | Marko Mäkelä | 2017-05-18 | 1 | -2/+4 |
| * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Merge branch 'merge-xtradb-5.6' into 10.0 | Vicențiu Ciorbaru | 2017-03-05 | 1 | -1/+1 |
| | |\ | |||||
| | | * | 5.6.35-80.0 | Vicențiu Ciorbaru | 2017-03-04 | 1 | -1/+1 |
| * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-01-04 | 1 | -12/+6 |
| |\ \ \ | |/ / | |||||
| | * | | MDEV-11694 InnoDB tries to create unused table SYS_ZIP_DICTbb-10.0-mdev-11694 | Marko Mäkelä | 2017-01-03 | 1 | -12/+6 |
| | |/ | |||||
| * | | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2016-11-02 | 1 | -6/+17 |
| |\ \ | |||||
| | * \ | Merge tag 'mariadb-10.0.28' into 10.0-galera | Nirbhay Choubey | 2016-10-28 | 1 | -6/+17 |
| | |\ \ | | |/ | |||||
| | | * | 5.6.33-79.0 | Sergei Golubchik | 2016-10-25 | 1 | -6/+17 |
| | * | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 2 | -11/+20 |
| | |\ \ | |||||
| | * \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -2/+0 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2015-02-18 | 1 | -1/+3 |
| | |\ \ \ \ | |||||
| | * | | | | | Merge -r4105..4106 from codership/5.6 | Jan Lindström | 2014-07-04 | 1 | -1/+1 |
| | * | | | | | bzr merge -r4091..4101 codership/5.6/ | Nirbhay Choubey | 2014-06-19 | 1 | -4/+4 |
| | * | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 2 | -21/+23 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 2 | -175/+489 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+133 |
| * | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 2 | -11/+20 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 2 | -11/+20 |
| | |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | | * | | | | | | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 2 | -11/+20 |
| | | * | | | | | | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 2 | -0/+3421 |
| | | / / / / / | |||||
| * | | | | | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -2/+0 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -2/+0 |
| | |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | | * | | | | | MDEV-8020: innodb.innodb-mdev-7055 produces valgrind warnings in buildbot | Jan Lindström | 2015-04-28 | 1 | -3/+1 |
| * | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-03-07 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-02-18 | 1 | -1/+3 |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | | | |||||
| | | * | | | | MDEV-7055: MySQL#74664 - InnoDB: Failing assertion: len <= col->len || col->m... | Jan Lindström | 2015-02-04 | 1 | -2/+4 |
| | | | |/ / | | |/| | | |||||
| * | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -2/+137 |
| |/ / / / | |||||
| * | | | | xtradb 5.6.17-65.0 | Sergei Golubchik | 2014-05-07 | 1 | -16/+17 |
| * | | | | MDEV-6184 10.0.11 merge | Sergei Golubchik | 2014-05-06 | 1 | -5/+6 |
| | |_|/ |/| | | |||||
| * | | | Percona-Server-5.6.14-rel62.0 merge | Sergei Golubchik | 2013-12-22 | 2 | -173/+486 |
| |/ / | |||||
| * | | Percona-Server-5.5.33-rel31.1.tar.gz | Sergei Golubchik | 2013-09-07 | 2 | -4/+4 |
| |/ | |||||
| * | merge with XtraDB as of Percona-Server-5.5.30-rel30.1 | Sergei Golubchik | 2013-03-08 | 1 | -66/+191 |
| * | Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5 | unknown | 2011-12-15 | 1 | -5/+5 |
| * | merge with xtradb-5.5.15 | Sergei Golubchik | 2011-07-18 | 2 | -11/+14 |
| * | Merge XtraDB from Percona server 5.1.49-12 into MariaDB. | unknown | 2010-09-03 | 1 | -1/+6 |
| * | Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB. | unknown | 2010-08-04 | 1 | -16/+70 |
| * | Merge XtraDB 9 into MariaDB. | unknown | 2010-01-15 | 1 | -3/+3 |
| * | Merge XtraDB 8 into MariaDB. | unknown | 2009-11-13 | 2 | -284/+244 |
| * | Merge XtraDB 6 into MariaDB. | unknown | 2009-08-03 | 1 | -2/+7 |
| * | Import Percona XtraDB into the MariaDB source tree. | unknown | 2009-06-09 | 2 | -0/+2954 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |