| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -7/+18 |
| |\ | |||||
| | * | MDEV-8869: Potential lock_sys->mutex deadlock | Jan Lindström | 2015-10-20 | 1 | -7/+18 |
| | * | Merge tag 'mariadb-10.0.21' into 10.0-galera | Nirbhay Choubey | 2015-08-08 | 1 | -1/+2 |
| | |\ | |||||
| | * \ | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 1 | -1/+3 |
| | |\ \ | |||||
| | * \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -3/+4 |
| | |\ \ \ | |||||
| | * | | | | refs #7 - merged fix from 5.5 branch. However, 5.6 branch has not (yet) surfa... | sjaakola | 2015-05-08 | 1 | -13/+19 |
| | * | | | | Merge tag 'mariadb-10.0.17' into 10.0-galera | Nirbhay Choubey | 2015-02-27 | 1 | -0/+43 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -7/+26 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 2 | -6/+3 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | MDEV-6807: InnoDB: Assertion failure in file lock0lock.cc (lock != ctx->wait_... | Nirbhay Choubey | 2014-10-03 | 1 | -3/+0 |
| | * | | | | | | | Fix compiler error when WITH_WSREP is not used. | Jan Lindström | 2014-08-27 | 1 | -10/+7 |
| | * | | | | | | | MDEV-6602: rpl.rpl_mdev6020 fails sporadically with SIGABRT | Jan Lindström | 2014-08-25 | 1 | -80/+121 |
| | * | | | | | | | Merge of innobase changes to xtradb. (r3871..3873). | Nirbhay Choubey | 2014-08-12 | 1 | -6/+24 |
| | * | | | | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -24/+150 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | bzr merge -r4091..4101 codership/5.6/ | Nirbhay Choubey | 2014-06-19 | 1 | -2/+9 |
| | * | | | | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -116/+121 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 2 | -88/+91 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | * bzr merge -r4027..4061 codership/5.6 | Nirbhay Choubey | 2014-03-26 | 2 | -85/+59 |
| | | * | | | | | | | | | bzr merge -r4021..4026 codership-mysql/5.6. | Nirbhay Choubey | 2014-03-25 | 1 | -1/+34 |
| | * | | | | | | | | | | Merging InnoDB changes to xtradb (r3783..3808). | Nirbhay Choubey | 2014-03-26 | 1 | -23/+21 |
| | |/ / / / / / / / / | |||||
| | * | | | | | | | | | MDEV-5644: Assertion failure during lock_cancel_waiting_and_release. | Jan Lindström | 2014-02-11 | 1 | -36/+212 |
| | * | | | | | | | | | Fixed issue on wsrep_kill_victim mutexing order error. Furthermore, fixed merge | Jan Lindström | 2014-01-29 | 1 | -3/+6 |
| | * | | | | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 3 | -1349/+2973 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 2 | -4/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -1/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -11/+11 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+297 |
| * | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-08-03 | 1 | -1/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | 5.6.25-73.1 | Sergei Golubchik | 2015-08-01 | 1 | -1/+2 |
| * | | | | | | | | | | | | | | Merge branch '10.0-galera' into 10.1 | Nirbhay Choubey | 2015-07-14 | 1 | -13/+19 |
| * | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-06-16 | 1 | -1/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | 5.6.24-72.2 | Sergei Golubchik | 2015-06-16 | 1 | -1/+3 |
| * | | | | | | | | | | | | | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | XtraDB-5.6.23-72.1 | Sergei Golubchik | 2015-05-05 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | 5.6.23-72.1 | Sergei Golubchik | 2015-05-04 | 1 | -2/+3 |
| | | * | | | | | | | | | | | move to storage/xtradb | Sergei Golubchik | 2015-05-04 | 3 | -0/+7869 |
| | | / / / / / / / / / / | |||||
| | * | | | | | | | | | | | MDEV-7249: Performance problem in parallel replication with multi-level slaves | Kristian Nielsen | 2015-03-13 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-03-07 | 1 | -0/+43 |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | MDEV-7623: Add lock wait time and hold time to every record/table lock in | Jan Lindström | 2015-02-24 | 1 | -0/+16 |
| | * | | | | | | | | | | MDEV-7620: Transaction lock wait is missing number of lock | Jan Lindström | 2015-02-23 | 1 | -0/+20 |
| | * | | | | | | | | | | Improve InnoDB transaction lock output by providing number of table locks | Jan Lindström | 2015-02-10 | 1 | -0/+7 |
| | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 1 | -7/+26 |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| | * | | | | | | | | | XtraDB 5.6.22-71.0 | Sergei Golubchik | 2015-01-21 | 1 | -7/+26 |
| | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | | MDEV-6676: Optimistic parallel replication | Kristian Nielsen | 2014-12-06 | 1 | -1/+1 |
| * | | | | | | | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 2 | -6/+3 |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| | * | | | | | | | | XtraDB 5.6.21-70.0 | Sergei Golubchik | 2014-11-20 | 1 | -2/+3 |
| | * | | | | | | | | MDEV-6933: Spurious lock_wait_timeout_thread wakeup in lock_wait_suspend_thre... | Jan Lindström | 2014-10-24 | 1 | -4/+0 |
| | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | | MDEV-7108: Make long semaphore wait timeout configurable | Jan Lindström | 2014-11-17 | 1 | -0/+3 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |