summaryrefslogtreecommitdiff
path: root/storage/innobase/include/trx0trx.h
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0-galera' into 10.1Sergei Golubchik2017-05-261-1/+1
|\
| * Fixed test failure on galere_wsrep_log_conflicts on XtraDB.Jan Lindström2017-03-201-0/+1
| * MW-28, codership/mysql-wsrep#28 Fix sync_thread_levels debug assertSachin Setiya2017-03-141-0/+17
| * Merge tag 'mariadb-10.0.26' into 10.0-galeraNirbhay Choubey2016-06-241-12/+12
| |\
* | | MW-28, codership/mysql-wsrep#28 Fix sync_thread_levels debug assertSachin Setiya2017-04-061-0/+17
* | | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T...Vladislav Vaintroub2017-03-231-1/+1
* | | MDEV-11236 Failing assertion: state == TRX_STATE_NOT_STARTEDMarko Mäkelä2016-12-021-1/+6
* | | A few fixes for VATS in 10.1sensssz2016-10-251-0/+2
* | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-281-12/+12
|\ \ \ | | |/ | |/|
| * | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-06-211-12/+12
| |\ \
| | * | 5.6.31Sergei Golubchik2016-06-211-12/+12
| | * | move to storage/innobaseSergei Golubchik2015-05-041-0/+1116
| | /
* | | Merge branch 'github/10.0-galera' into 10.1Sergei Golubchik2015-12-221-5/+8
|\ \ \ | | |/ | |/|
| * | MDEV-8869: Potential lock_sys->mutex deadlockbb-10.0-galera-janJan Lindström2015-12-211-2/+8
| * | MDEV-8869: Potential lock_sys->mutex deadlockJan Lindström2015-12-141-5/+2
| * | Merge tag 'mariadb-10.0.17' into 10.0-galeraNirbhay Choubey2015-02-271-0/+13
| |\ \ | | |/
| * | bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-0/+5
| |\ \
| * \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-2/+1
| |\ \ \
| * \ \ \ * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-5/+20
| |\ \ \ \
| * \ \ \ \ Merge 10.0 to galera-10.0Jan Lindström2013-09-031-43/+96
| |\ \ \ \ \
| * | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-0/+3
* | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-0/+14
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | MDEV-7620: Transaction lock wait is missing number of lock Jan Lindström2015-02-231-0/+13
| | |_|_|_|/ | |/| | | |
* | | | | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replica...Kristian Nielsen2014-07-081-0/+5
| | |_|_|/ | |/| | |
* | | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+3
|/ / / /
* | | | MDEV-6184 10.0.11 mergeSergei Golubchik2014-05-061-2/+1
| |_|/ |/| |
* | | InnoDB 5.6.15 merge.Sergei Golubchik2014-02-261-0/+4
* | | MDEV-5574 Set AUTO_INCREMENT below max value of column.Sergei Golubchik2014-02-011-5/+16
| |/ |/|
* | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-43/+96
|/
* Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-011-299/+519
* merge with 5.3Sergei Golubchik2011-10-191-1/+1
|\
* \ Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-04-111-0/+11
|\ \
| * | Bug #11766513 - 59641: Prepared XA transaction in system after hard crashMarko Mäkelä2011-04-071-0/+5
| |/
* | Bug 12323643 - CLEAN UP THE INNODB THREAD SHUTDOWN AND ASSERTIONS (WL#5136)Marko Mäkelä2011-04-051-5/+0
* | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-01-271-2/+2
|\ \ | |/
| * Bug#59440 Race condition in XA ROLLBACK and XA COMMIT after server restartMarko Mäkelä2011-01-271-2/+3
| * Make the InnoDB FOREIGN KEY parser understand multi-statements. (Bug #48024)Marko Mäkelä2010-05-141-0/+2
* | Bug #57243 Inconsistent use of trans_register_ha() API in InnoDBSunny Bains2010-10-211-3/+14
* | Bug#54728: Replace the dulint struct with a 64-bit integer.Marko Mäkelä2010-06-231-17/+7
* | Merge from mysql-5.1-innodb:Marko Mäkelä2010-05-141-3/+0
* | Fix bug introduced by r3038. When a transaction is rolled back by theSunny Bains2010-04-281-10/+0
* | Fix a race condition introduced by r7004. We need to acquire the srv_sys->mutexSunny Bains2010-04-231-0/+10
* | Merge r3403..3414 from mysql-5.1-innodb:Vasil Dimov2010-04-221-0/+8
* | Import branches/innodb+ from SVN on top of storage/innobase.Vasil Dimov2010-04-121-32/+37
* | manual merge mysql-5.1-bugteam --> mysql-trunk-mergeGleb Shchepa2009-12-041-3/+1
|\ \ | |/
| * Bug #38883 (reopened): thd_security_context is not thread safe, crashes?Gleb Shchepa2009-12-011-3/+1
* | Merging Innodb plugin 1.0.5 revisions from 5.1-main from revisions 3149 to 3163Satya B2009-10-161-2/+2
* | Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the sameGuilhem Bichot2009-08-071-0/+814
* | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-713/+0
|/