summaryrefslogtreecommitdiff
path: root/storage/innobase/lock
Commit message (Expand)AuthorAgeFilesLines
* Fixed compiler warnings and test failures found by buildbotMonty2016-06-241-2/+2
* Fixed compiler warningsMichael Widenius2016-04-071-4/+4
* Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-02-241-1/+38
|\
| * Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-231-1/+1
| |\
| * | refs codership/mysql-wsrep#184Daniele Sciascia2016-02-221-2/+3
| * | refs codership/mysql-wsrep#184Daniele Sciascia2016-02-221-1/+2
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-02-231-1/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-02-161-1/+1
| |\ \
| | * | 5.6.29Sergei Golubchik2016-02-161-1/+1
* | | | 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
| * | | MDEV-8869: Potential lock_sys->mutex deadlockJan Lindström2015-12-141-10/+16
* | | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-11-191-7/+18
|\ \ \ \ | |/ / /
| * | | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-3/+4
| |\ \ \ | | |/ /
| * | | MDEV-8869: Potential lock_sys->mutex deadlockJan Lindström2015-10-201-7/+18
| * | | Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-091-2/+4
| |\ \ \
| * | | | refs #7 - merged fix from 5.5 branch. However, 5.6 branch has not (yet) surfa...sjaakola2015-05-081-14/+20
| * | | | Merge tag 'mariadb-10.0.17' into 10.0-galeraNirbhay Choubey2015-02-271-1/+45
| |\ \ \ \
| * \ \ \ \ maria-10.0.16 mergeNirbhay Choubey2015-01-261-5/+22
| |\ \ \ \ \
| * \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-052-6/+3
| |\ \ \ \ \ \
| * | | | | | | MDEV-6807: InnoDB: Assertion failure in file lock0lock.cc (lock != ctx->wait_...Nirbhay Choubey2014-10-031-3/+0
| * | | | | | | Fix compiler error when WITH_WSREP is not used.Jan Lindström2014-08-271-9/+8
| * | | | | | | MDEV-6602: rpl.rpl_mdev6020 fails sporadically with SIGABRTJan Lindström2014-08-251-80/+121
| * | | | | | | bzr merge -r4104..4120 codership/5.6/Nirbhay Choubey2014-08-121-6/+24
| * | | | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-24/+150
| |\ \ \ \ \ \ \
| * | | | | | | | bzr merge -r4091..4101 codership/5.6/Nirbhay Choubey2014-06-191-2/+9
| * | | | | | | | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-98/+81
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-272-87/+91
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | * bzr merge -r4027..4061 codership/5.6Nirbhay Choubey2014-03-262-83/+59
| | * | | | | | | | | bzr merge -r4021..4026 codership-mysql/5.6.Nirbhay Choubey2014-03-251-1/+34
| * | | | | | | | | | Merging wsrep specific changes from InnoDB toNirbhay Choubey2014-03-261-5/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Merging InnoDB changes to xtradb (r3783..3808).Nirbhay Choubey2014-03-261-5/+4
| | |/ / / / / / / / /
| * | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-262-117/+178
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | MDEV-5644: Assertion failure during lock_cancel_waiting_and_release.Jan Lindström2014-02-111-50/+153
| * | | | | | | | | | Fixed issue on wsrep_kill_victim mutexing order error. Furthermore, fixed mergeJan Lindström2014-01-291-5/+7
| * | | | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-2/+2
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-041-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Ported all remaining storage/innobase changes from lp:codership-mysql/5.6, up...Seppo Jaakola2013-11-271-20/+29
| * | | | | | | | | | | diffed in fix in #3953 from lp:codership-mysql/5.6Seppo Jaakola2013-11-271-20/+22
| * | | | | | | | | | | Fixed performance schema instrumentation on galera and added correct mutexing...Jan Lindström2013-10-151-3/+10
| * | | | | | | | | | | After merge fixesJan Lindström2013-09-251-89/+90
| * | | | | | | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-032-121/+273
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| * | | | | | | | | | | Initial fixes after mariadb 10 merge, basic replication works nowSeppo Jaakola2013-07-161-1/+0
| * | | | | | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-6/+301
| * | | | | | | | | | | 10.0-base mergeSergei Golubchik2013-04-151-19/+80
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN...Yasufumi Kinoshita2012-11-281-15/+72
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN...Yasufumi Kinoshita2012-11-281-14/+71
| | * | | | | | | | | | | | This is a backport of "WL#5674 InnoDB: report all deadlocks (Bug#1784)"Vasil Dimov2012-11-121-47/+104
* | | | | | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2015-10-091-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
View Lorry Controller Status