summaryrefslogtreecommitdiff
path: root/storage/innobase/lock
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-04-031-2/+2
|\
| * Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-2/+2
| |\
| | * MDEV-11738: Mariadb uses 100% of several of my 8 cpus doing nothingJan Lindström2017-03-141-22/+20
| | * Fix InnoDB/XtraDB compilation warnings on 32-bit builds.Marko Mäkelä2017-03-091-4/+9
* | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3Alexander Barkov2017-03-242-76/+100
|\ \ \ | |/ /
| * | Bug#21153166: REMOVE UNUSED VARIABLES AND CONVERT GLOBAL SYMBOLS TO STATICJon Olav Hauglid2017-03-171-1/+1
| * | MDEV-12270 Port MySQL 8.0 Bug#21141390 REMOVE UNUSED FUNCTIONS AND CONVERT GL...Marko Mäkelä2017-03-172-62/+99
| * | MDEV-12271 Port MySQL 8.0 Bug#23150562 REMOVE UNIV_MUST_NOT_INLINE AND UNIV_N...Marko Mäkelä2017-03-172-13/+0
* | | MDEV-11379, MDEV-11388 - [WAIT n|NOWAIT]Sergey Vojtovich2017-03-221-5/+10
|/ /
* | Fix many -Wconversion warnings.Marko Mäkelä2017-03-071-3/+3
* | MDEV-11849: Fix storage/innobase/* compile warningsJan Lindström2017-01-261-0/+3
* | Follow-up to MDEV-11713: Make more use of DBUG_LOGMarko Mäkelä2017-01-121-11/+10
* | Fixes for failures in test scripts and removal of some compiler warningsMonty2017-01-111-1/+1
* | Merge 10.1 to 10.2Marko Mäkelä2017-01-051-8/+2
|\ \ | |/
| * 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-21/+20
| * 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/+26
| * A few fixes for VATS in 10.1sensssz2016-10-251-151/+360
| * 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: add * and ; for innodbsensssz2016-10-111-2/+2
| * Implement VATS both in InnoDB and XtraDB. Add configuration options for it in...sensssz2016-10-111-14/+144
* | Merge branch '10.2-vats' of https://github.com/sensssz/server into sensssz-10...Jan Lindström2016-12-071-2/+5
|\ \
| * | Bug fix: consider lock wait mode first.sensssz2016-12-011-18/+9
* | | MDEV-11168: InnoDB: Failing assertion: !other_lock || wsrep_thd_is_BF(lock->t...Jan Lindström2016-12-021-16/+1
* | | MDEV-11168: InnoDB: Failing assertion: !other_lock || wsrep_thd_is_BF(lock->t...Jan Lindström2016-12-011-3/+5
* | | MDEV-10692: InnoDB: Failing assertion: lock->trx->lock.wait_lock == lockJan Lindström2016-11-091-2/+3
* | | MDEV-10692: InnoDB: Failing assertion: lock->trx->lock.wait_lock == lockJan Lindström2016-11-091-1/+24
|/ /
* | Remove duplicated comments.sensssz2016-10-231-5/+1
* | Change all space indentions to tab.sensssz2016-10-231-271/+270
* | Style fixes.sensssz2016-10-231-11/+10
* | Remove unnecessary changes. Apply changes to XtraDB.sensssz2016-10-221-8/+0
* | A few bug fixes. Use thd_is_slave_replication.sensssz2016-10-221-32/+85
* | Bug fix: remove redundant code from check_deadlock_result. Remove assert.sensssz2016-10-191-20/+1
* | Change VATS implementation.sensssz2016-10-191-167/+322
* | Implement VATS in XtraDB and InnoDB.sensssz2016-10-191-21/+220
* | MDEV-10813 - Clean-up InnoDB atomics, memory barriers and mutexesSergey Vojtovich2016-10-171-6/+2
* | Move InnoDB/XtraDB to async deadlock kill for parallel replication.Kristian Nielsen2016-10-171-107/+14
* | Merge branch '10.2' into bb-10.2-janSergei Golubchik2016-09-191-1/+4
|\ \
| * \ Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-7/+15
| |\ \ | | |/
| | * Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-08-251-7/+15
| | |\
| | | * Refs: MW-279sjaakola2016-08-211-7/+15
| | | * Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-242-10/+12
| | | |\
* | | | | Remove a bunch of TODO's, fix perfschema.threads_innodb testSergei Golubchik2016-09-112-5/+1
* | | | | misc after-merge changes:Sergei Golubchik2016-09-102-2/+2
* | | | | Merge InnoDB 5.7 from mysql-5.7.14.Jan Lindström2016-09-083-493/+494
* | | | | Merge InnoDB 5.7 from mysql-5.7.9.Jan Lindström2016-09-024-2852/+4357
|/ / / /
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-302-10/+12
|\ \ \ \ | |/ / /