| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Remove XtraDB | Marko Mäkelä | 2017-06-21 | 1 | -1232/+0 |
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-06-08 | 1 | -2/+19 |
| |\ | |||||
| | * | Merge branch '10.0-galera' into 10.1 | Sergei Golubchik | 2017-05-26 | 1 | -2/+19 |
| | |\ | |||||
| | | * | Fixed test failure on galere_wsrep_log_conflicts on XtraDB. | Jan Lindström | 2017-03-20 | 1 | -1/+19 |
| | | * | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-merge | Sachin Setiya | 2017-03-17 | 1 | -1/+1 |
| | | |\ | |||||
| | | * \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -14/+14 |
| | | |\ \ | |||||
| * | | \ \ | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-04-28 | 1 | -0/+17 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | MW-28, codership/mysql-wsrep#28 Fix sync_thread_levels debug assert | Sachin Setiya | 2017-04-06 | 1 | -0/+17 |
| * | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -2/+2 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T... | Vladislav Vaintroub | 2017-03-23 | 1 | -1/+1 |
| | * | | | | 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 branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -0/+2 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | MDEV-11236 Failing assertion: state == TRX_STATE_NOT_STARTED | Marko Mäkelä | 2016-12-02 | 1 | -2/+7 |
| | * | | | | A few fixes for VATS in 10.1 | sensssz | 2016-10-25 | 1 | -0/+2 |
| * | | | | | MDEV-11236 Failing assertion: state == TRX_STATE_NOT_STARTED | Marko Mäkelä | 2016-12-02 | 1 | -2/+7 |
| * | | | | | Move InnoDB/XtraDB to async deadlock kill for parallel replication. | Kristian Nielsen | 2016-10-17 | 1 | -2/+1 |
| |/ / / / | |||||
| * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -14/+14 |
| |\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| | * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -14/+14 |
| | |\ \ | | |/ | |||||
| | | * | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 1 | -14/+14 |
| | | * | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 1 | -0/+1162 |
| * | | MDEV-8869: Potential lock_sys->mutex deadlockbb-10.0-galera-jan | Jan Lindström | 2015-12-21 | 1 | -2/+8 |
| * | | MDEV-8869: Potential lock_sys->mutex deadlock | Jan Lindström | 2015-12-14 | 1 | -5/+2 |
| * | | Merge tag 'mariadb-10.0.17' into 10.0-galera | Nirbhay Choubey | 2015-02-27 | 1 | -0/+15 |
| |\ \ | |/ | |||||
| | * | MDEV-7620: Transaction lock wait is missing number of lock | Jan Lindström | 2015-02-23 | 1 | -0/+15 |
| * | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -0/+16 |
| |\ \ | |/ | |||||
| | * | xtradb-5.6.19-67.0 | Sergei Golubchik | 2014-08-06 | 1 | -0/+11 |
| | * | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replica... | Kristian Nielsen | 2014-07-08 | 1 | -0/+5 |
| * | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -2/+1 |
| |\ \ | |/ | |||||
| | * | MDEV-6184 10.0.11 merge | Sergei Golubchik | 2014-05-06 | 1 | -2/+1 |
| * | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -0/+4 |
| |\ \ | |/ | |||||
| | * | Percona-Server-5.6.15-rel63.0.tar.gz merge | Sergei Golubchik | 2014-02-26 | 1 | -0/+4 |
| * | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -349/+611 |
| |\ \ | |/ | |||||
| | * | Percona-Server-5.6.14-rel62.0 merge | Sergei Golubchik | 2013-12-22 | 1 | -346/+606 |
| | * | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -5/+7 |
| | |\ | |||||
| | | * | Percona-Server-5.5.34-rel32.0 merge | Sergei Golubchik | 2013-11-19 | 1 | -5/+7 |
| * | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -2/+2 |
| |\ \ \ | |/ / | |||||
| | * | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -2/+2 |
| | |\ \ | | |/ | |||||
| | | * | Percona-Server-5.5.33-rel31.1.tar.gz | Sergei Golubchik | 2013-09-07 | 1 | -2/+2 |
| * | | | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -7/+36 |
| |\ \ \ | |/ / | |||||
| | * | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -7/+36 |
| | |\ \ | | |/ | |||||
| | | * | Merge with XtraDB as of Percona-Server-5.5.30-rel30.2 | Sergei Golubchik | 2013-05-08 | 1 | -7/+36 |
| * | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+3 |
| |/ / | |||||
| * | | MDEV-232: Remove one fsync() from commit phase. | unknown | 2012-09-13 | 1 | -1/+0 |
| |/ | |||||
| * | Merge XtraDB from Percona-Server-5.5.20-24.1 into MariaDB 5.5. | unknown | 2012-02-15 | 1 | -0/+1 |
| * | Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5 | unknown | 2011-12-15 | 1 | -0/+3 |
| * | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+5 |
| |\ | |||||
| | * | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -2/+2 |
| | |\ | |||||
| | | * | Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1. | unknown | 2011-04-29 | 1 | -2/+2 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |