Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Never pass NULL to innobase_get_stmt() | Marko Mäkelä | 2017-05-17 | 1 | -9/+13 |
* | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-12 | 1 | -9/+14 |
|\ | |||||
| * | MDEV-12674 Innodb_row_lock_current_waits has overflow | Marko Mäkelä | 2017-05-12 | 1 | -8/+14 |
* | | MW-28, codership/mysql-wsrep#28 Fix sync_thread_levels debug assert | Sachin Setiya | 2017-04-06 | 1 | -6/+2 |
* | | MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothing | Jan Lindström | 2017-03-14 | 1 | -23/+19 |
* | | Fix InnoDB/XtraDB compilation warnings on 32-bit builds. | Marko Mäkelä | 2017-03-09 | 1 | -4/+9 |
* | | MDEV-11638 Encryption causes race conditions in InnoDB shutdown | Marko Mäkelä | 2017-01-05 | 1 | -7/+2 |
* | | MDEV-11168: InnoDB: Failing assertion: !other_lock || wsrep_thd_is_BF(lock->t... | sensssz | 2016-12-02 | 1 | -14/+12 |
* | | MDEV-11349 (1/2) Fix some clang 4.0 warnings | Marko Mäkelä | 2016-11-25 | 1 | -1/+0 |
* | | MDEV-10692: InnoDB: Failing assertion: lock->trx->lock.wait_lock == lock | Jan Lindström | 2016-11-09 | 1 | -1/+25 |
* | | A few fixes for VATS in 10.1 | sensssz | 2016-10-25 | 1 | -107/+316 |
* | | Move the lock after deadlock is resolved. | sensssz | 2016-10-13 | 1 | -11/+15 |
* | | Get thd by lock->trx->mysql_thd. | sensssz | 2016-10-12 | 1 | -1/+1 |
* | | Reduce conflict during in-order replication. | sensssz | 2016-10-12 | 1 | -0/+15 |
* | | Bug fix: missing * and ; | sensssz | 2016-10-11 | 1 | -2/+2 |
* | | Bug fix: add undeclared variables. | sensssz | 2016-10-11 | 1 | -0/+3 |
* | | Implement VATS both in InnoDB and XtraDB. Add configuration options for it in... | sensssz | 2016-10-11 | 1 | -14/+141 |
* | | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-08-25 | 1 | -7/+15 |
|\ \ | |||||
| * \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 2 | -13/+14 |
| |\ \ | | |/ | |||||
| * | | Refs: MW-279 | sjaakola | 2016-08-21 | 1 | -7/+15 |
| * | | Merge tag 'mariadb-10.0.26' into 10.0-galera | Nirbhay Choubey | 2016-06-24 | 1 | -0/+11 |
| |\ \ | |||||
| * \ \ | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -1/+1 |
| |\ \ \ | |||||
* | \ \ \ | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 2 | -13/+14 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-08-10 | 2 | -13/+14 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | 5.6.31-77.0 | Sergei Golubchik | 2016-08-10 | 2 | -13/+14 |
* | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -0/+11 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch 'merge-xtradb-5.6' into 0.0 | Sergei Golubchik | 2016-06-21 | 1 | -0/+11 |
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | | |||||
| | * | | 5.6.30-76.3 | Sergei Golubchik | 2016-06-21 | 1 | -0/+11 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.6.29-76.2 | Sergei Golubchik | 2016-04-26 | 1 | -1/+1 |
* | | | | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-02-24 | 1 | -1/+3 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | refs codership/mysql-wsrep#184 | Nirbhay Choubey | 2016-02-22 | 1 | -2/+3 |
| * | | | refs codership/mysql-wsrep#184 | Nirbhay Choubey | 2016-02-22 | 1 | -1/+2 |
* | | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-12-22 | 1 | -10/+50 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-8869: Potential lock_sys->mutex deadlockbb-10.0-galera-jan | Jan Lindström | 2015-12-21 | 1 | -2/+37 |
| * | | | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| * | | | MDEV-8869: Potential lock_sys->mutex deadlock | Jan Lindström | 2015-12-14 | 1 | -10/+16 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -2/+2 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -2/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | 5.6.27-76.0 | Sergei Golubchik | 2015-12-13 | 1 | -2/+2 |
* | | | | 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 |
| |\ \ \ \ \ \ \ |