summaryrefslogtreecommitdiff
path: root/storage/innobase/trx
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-06-285-24/+26
|\
| * Merge following commit from 5.5:Jan Lindström2016-06-231-1/+1
| * Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2016-06-215-23/+25
| |\
| | * 5.6.31Sergei Golubchik2016-06-215-23/+25
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-11/+11
|\ \ \ | |/ /
| * | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2015-10-091-11/+11
| |\ \ | | |/
| | * 5.6.27Sergei Golubchik2015-10-091-11/+11
* | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-272-7/+2
|\ \ \ | |/ /
| * | Merge branch 'merge-innodb-5.6' into 10.0Sergei Golubchik2015-06-162-7/+2
| |\ \ | | |/
| | * 5.6.25Sergei Golubchik2015-06-162-7/+2
| | * move to storage/innobaseSergei Golubchik2015-05-048-0/+12187
* | Merge 10.0 -> 10.1Kristian Nielsen2015-04-201-1/+1
|\ \ | |/
| * MDEV-7908: assertion in innobase_release_savepointJan Lindström2015-04-061-1/+1
* | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-0/+5
|\ \ | |/
| * innodb 5.6.23Sergei Golubchik2015-02-181-0/+5
* | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-025-27/+20
|\ \ | |/
| * InnoDB 5.6.21Sergei Golubchik2014-11-202-16/+11
| * MDEV-6925: Remove bad "" operators.Jan Lindström2014-10-261-1/+1
| * MDEV-6928: Add trx pointer to struct mtr_tJan Lindström2014-10-242-10/+8
* | MDEV-6929: Port Facebook Prefix Index Queries OptimizationJan Lindström2014-11-031-1/+2
* | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-153-34/+29
|\ \ | |/
| * InnoDB 5.6.20Sergei Golubchik2014-09-111-11/+11
| * innodb-5.6.19Sergei Golubchik2014-08-062-3/+3
| * MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replica...Kristian Nielsen2014-07-091-2/+3
| * MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replica...Kristian Nielsen2014-07-081-0/+3
| * MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallelunknown2014-06-101-23/+14
* | fixing embedded: WaaS. Wsrep as a Service.Sergei Golubchik2014-10-012-4/+4
* | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-262-1/+168
|/
* innodb 5.6.17Sergei Golubchik2014-05-071-1/+2
* MDEV-6184 10.0.11 mergeSergei Golubchik2014-05-061-0/+14
* InnoDB 5.6.15 merge.Sergei Golubchik2014-02-263-8/+29
* MDEV-5574 Set AUTO_INCREMENT below max value of column.Sergei Golubchik2014-02-015-116/+259
* MDEV-4808: Assertion: trx->start_file != 0 fails in trx0trx.cc on killing CRE...Jan Lindström2013-10-011-1/+1
* Temporary commit of 10.0-mergeMichael Widenius2013-03-267-316/+442
* 10.0-base -> 10.0-montySergei Golubchik2012-10-191-3/+8
|\
| * MDEV-232: Remove one fsync() from commit phase.unknown2012-09-131-3/+8
| * merge with MySQL 5.5.27Sergei Golubchik2012-08-091-1/+1
| |\
| | * WL#6161 Integrating with InnoDB codebase in MySQL 5.5Narayanan Venkateswaran2012-06-071-1/+1
* | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6Michael Widenius2012-08-019-3964/+3740
|/ /
* | mysql 5.5.23 mergeSergei Golubchik2012-04-101-1/+1
|\ \ | |/
| * Merge from mysql-5.1.Sunny Bains2012-03-281-1/+1
| |\
| | * Merge from mysql-5.0Sunny Bains2012-03-281-2/+2
* | | mysql-5.5.22 mergeSergei Golubchik2012-03-284-58/+58
|\ \ \ | |/ /
| * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2012-02-173-55/+49
| |\ \ | | |/
| * | Merge from mysql-5.1-innodb.Sunny Bains2012-02-101-0/+2
| |\ \
| * | | Bug #13651627 Move ut_ad(0) from the beginning to the end of buf_page_print(),Marko Mäkelä2012-02-021-3/+7
* | | | merge with mysql-5.5.21Sergei Golubchik2012-03-093-2/+11
|\ \ \ \ | |/ / /
| * | | Bug #13413535 61104: INNODB: FAILING ASSERTION: PAGE_GET_N_RECS(PAGE) > 1Marko Mäkelä2012-01-262-2/+6
| * | | Bug#12400341 INNODB CAN LEAVE ORPHAN IBD FILES AROUNDYasufumi Kinoshita2012-01-101-0/+5
| |\ \ \ | | | |/ | | |/|
| | * | Bug#12400341 INNODB CAN LEAVE ORPHAN IBD FILES AROUNDYasufumi Kinoshita2012-01-101-0/+4
View Lorry Controller Status