summaryrefslogtreecommitdiff
path: root/storage/innobase/include/lock0lock.h
Commit message (Expand)AuthorAgeFilesLines
* MDEV-11802 innodb.innodb_bug14676111 failsMarko Mäkelä2017-02-201-5/+12
* MDEV-11849: Fix storage/innobase/* compile warningsJan Lindström2017-01-261-2/+1
* Change all space indentions to tab.sensssz2016-10-231-5/+5
* Implement VATS in XtraDB and InnoDB.sensssz2016-10-191-0/+11
* Merge InnoDB 5.7 from mysql-5.7.14.Jan Lindström2016-09-081-17/+31
* Merge InnoDB 5.7 from mysql-5.7.9.Jan Lindström2016-09-021-129/+260
* Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-18/+18
|\
| * Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-06-211-18/+18
| |\
| | * 5.6.31Sergei Golubchik2016-06-211-18/+18
| | * move to storage/innobaseSergei Golubchik2015-05-041-0/+979
* | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-221-0/+18
|\ \
| * | MDEV-8869: Potential lock_sys->mutex deadlockbb-10.0-galera-janJan Lindström2015-12-211-0/+8
| * | MDEV-8869: Potential lock_sys->mutex deadlockJan Lindström2015-12-141-0/+10
| * | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-1/+1
| |\ \ | | |/
| * | bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-10/+6
| |\ \
| * \ \ Merging revision from codership-mysql/5.5 (r3928..3968) andNirbhay Choubey2014-03-271-1/+0
| |\ \ \
| | * | | * bzr merge -r4027..4061 codership/5.6Nirbhay Choubey2014-03-261-1/+0
| * | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-1/+22
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-35/+42
| |\ \ \ \
| * | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-3/+11
| * | | | | 10.0-base mergeSergei Golubchik2013-04-151-2/+10
| |\ \ \ \ \
| | * \ \ \ \ Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN...Yasufumi Kinoshita2012-11-281-2/+10
| | |\ \ \ \ \
| | | * | | | | Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN...Yasufumi Kinoshita2012-11-281-0/+7
| | | * | | | | Bug#53674: InnoDB: Error: unlock row could not find a 4 mode lock on the recordMarko Mäkelä2010-06-021-5/+7
| | | * | | | | Applying InnoDB snapshot 5.1-ss6344, Fixes BUG#47814Satya B2009-12-231-2/+7
* | | | | | | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | MDEV-6340 Mariadb 10.0.12 fatal "Lost connection" error w/ GCC 4.9 'Release' ...Sergei Golubchik2014-07-311-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-271-0/+10
|\ \ \ \ \ \ \
| * | | | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+10
| |/ / / / / /
* | | | | | | MDEV-5834: Merge Kakao Defragmentation implementation to MariaDB 10.1Jan Lindström2014-08-061-0/+10
|/ / / / / /
* | | | | | innodb 5.6.17Sergei Golubchik2014-05-071-11/+4
| |_|_|_|/ |/| | | |
* | | | | MDEV-5574 Set AUTO_INCREMENT below max value of column.Sergei Golubchik2014-02-011-1/+22
| |_|_|/ |/| | |
* | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-37/+52
|/ / /
* | | 10.0-base mergeSergei Golubchik2013-01-311-0/+25
|\ \ \ | |/ /
* | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-70/+166
|/ /
* | Bug#12584374 LOCK_VALIDATE TRIPS ASSERTION !BLOCK->PAGE.FILE_PAGE_WAS_FREEDMarko Mäkelä2011-05-241-3/+4
* | Bug#54728: Replace the dulint struct with a 64-bit integer.Marko Mäkelä2010-06-231-2/+2
* | Merge from mysql-5.1-innodb:Marko Mäkelä2010-06-021-5/+7
* | Check in patch for bug #53336, Improved InnoDB Transaction Reporting.Jimmy Yang2010-05-121-1/+1
* | Import branches/innodb+ from SVN on top of storage/innobase.Vasil Dimov2010-04-121-5/+8
* | Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mys...Satya B2009-12-021-0/+6
|\ \ | |/
* | Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163Satya B2009-10-161-0/+8
* | Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the sameGuilhem Bichot2009-08-071-0/+809
* | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-709/+0
|/
* Apply InnoDB snapshot innodb-5.1-ss2858, part 2. FixesTimothy Smith2008-12-141-5/+12
* Apply InnoDB snapshot innodb-5.1-ss1726.unknown2007-08-241-1/+1
* Apply snapshot innodb-51-ss1644unknown2007-07-241-1/+13
* Applied innodb-5.1-ss475 snapshot.unknown2006-04-231-0/+9
* Applied innodb-5.1-ss269 snapshot.unknown2006-03-101-7/+7
* WL#1012: All changes as one single changeset.unknown2005-12-221-8/+12