summaryrefslogtreecommitdiff
path: root/storage/xtradb/lock
Commit message (Expand)AuthorAgeFilesLines
* Never pass NULL to innobase_get_stmt()Marko Mäkelä2017-05-171-9/+13
* Merge 10.0 into 10.1Marko Mäkelä2017-05-121-9/+14
|\
| * MDEV-12674 Innodb_row_lock_current_waits has overflowMarko Mäkelä2017-05-121-8/+14
* | MW-28, codership/mysql-wsrep#28 Fix sync_thread_levels debug assertSachin Setiya2017-04-061-6/+2
* | MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothingJan Lindström2017-03-141-23/+19
* | Fix InnoDB/XtraDB compilation warnings on 32-bit builds.Marko Mäkelä2017-03-091-4/+9
* | MDEV-11638 Encryption causes race conditions in InnoDB shutdownMarko Mäkelä2017-01-051-7/+2
* | MDEV-11168: InnoDB: Failing assertion: !other_lock || wsrep_thd_is_BF(lock->t...sensssz2016-12-021-14/+12
* | MDEV-11349 (1/2) Fix some clang 4.0 warningsMarko Mäkelä2016-11-251-1/+0
* | MDEV-10692: InnoDB: Failing assertion: lock->trx->lock.wait_lock == lockJan Lindström2016-11-091-1/+25
* | A few fixes for VATS in 10.1sensssz2016-10-251-107/+316
* | Move the lock after deadlock is resolved.sensssz2016-10-131-11/+15
* | Get thd by lock->trx->mysql_thd.sensssz2016-10-121-1/+1
* | Reduce conflict during in-order replication.sensssz2016-10-121-0/+15
* | Bug fix: missing * and ;sensssz2016-10-111-2/+2
* | Bug fix: add undeclared variables.sensssz2016-10-111-0/+3
* | Implement VATS both in InnoDB and XtraDB. Add configuration options for it in...sensssz2016-10-111-14/+141
* | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-08-251-7/+15
|\ \
| * \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-242-13/+14
| |\ \ | | |/
| * | Refs: MW-279sjaakola2016-08-211-7/+15
| * | Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-241-0/+11
| |\ \
| * \ \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-04-291-1/+1
| |\ \ \
* | \ \ \ Merge branch '10.0' into 10.1Sergei Golubchik2016-08-252-13/+14
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-102-13/+14
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | 5.6.31-77.0Sergei Golubchik2016-08-102-13/+14
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-0/+11
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'merge-xtradb-5.6' into 0.0Sergei Golubchik2016-06-211-0/+11
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | 5.6.30-76.3Sergei Golubchik2016-06-211-0/+11
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-1/+1
|\ \ \ \ | |/ / /
| * | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2016-04-261-1/+1
| |\ \ \ | | |/ /
| | * | 5.6.29-76.2Sergei Golubchik2016-04-261-1/+1
* | | | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-241-1/+3
|\ \ \ \ | | |_|/ | |/| |
| * | | refs codership/mysql-wsrep#184Nirbhay Choubey2016-02-221-2/+3
| * | | refs codership/mysql-wsrep#184Nirbhay Choubey2016-02-221-1/+2
* | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-221-10/+50
|\ \ \ \ | |/ / /
| * | | MDEV-8869: Potential lock_sys->mutex deadlockbb-10.0-galera-janJan Lindström2015-12-211-2/+37
| * | | Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-2/+2
| |\ \ \ | | |/ /
| * | | MDEV-8869: Potential lock_sys->mutex deadlockJan Lindström2015-12-141-10/+16
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2015-12-131-2/+2
| |\ \ \ | | | |/ | | |/|
| | * | 5.6.27-76.0Sergei Golubchik2015-12-131-2/+2
* | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-11-191-7/+18
|\ \ \ \ | | |_|/ | |/| |
| * | | MDEV-8869: Potential lock_sys->mutex deadlockJan Lindström2015-10-201-7/+18
| * | | Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-1/+2
| |\ \ \ | | |/ /
| * | | Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-1/+3
| |\ \ \
| * \ \ \ Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-3/+4
| |\ \ \ \
| * | | | | refs #7 - merged fix from 5.5 branch. However, 5.6 branch has not (yet) surfa...sjaakola2015-05-081-13/+19
| * | | | | Merge tag 'mariadb-10.0.17' into 10.0-galeraNirbhay Choubey2015-02-271-0/+43
| |\ \ \ \ \
| * \ \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-261-7/+26
| |\ \ \ \ \ \
| * \ \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-052-6/+3
| |\ \ \ \ \ \ \