summaryrefslogtreecommitdiff
path: root/storage/xtradb/trx
Commit message (Expand)AuthorAgeFilesLines
* MDEV-11236 Failing assertion: state == TRX_STATE_NOT_STARTEDMarko Mäkelä2016-12-021-1/+3
* Merge branch '10.1' into 10.2Sergei Golubchik2016-09-095-23/+25
|\
| * Merge branch '10.0' into 10.1Sergei Golubchik2016-08-255-23/+25
| |\
| | * Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-105-23/+25
| | |\
| | | * 5.6.31-77.0Sergei Golubchik2016-08-105-23/+25
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-302-1/+3
|\ \ \ \ | |/ / /
| * | | Merge branch '10.0' into 10.1Sergei Golubchik2016-06-282-1/+3
| |\ \ \ | | |/ /
| | * | Merge following commit from 5.5:Jan Lindström2016-06-231-1/+1
| | * | Merge branch 'merge-xtradb-5.6' into 0.0Sergei Golubchik2016-06-211-0/+2
| | |\ \ | | | |/
| | | * 5.6.30-76.3Sergei Golubchik2016-06-211-0/+2
* | | | MDEV-6368: assertion xid_seqno > trx_sys_cur_xid_seqnoNirbhay Choubey2016-05-311-2/+11
|/ / /
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-212-11/+17
|\ \ \ | |/ /
| * | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2015-12-132-11/+17
| |\ \ | | |/
| | * 5.6.27-76.0Sergei Golubchik2015-12-132-11/+17
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-09-032-7/+3
|\ \ \ | |/ /
| * | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-08-032-7/+3
| |\ \ | | |/
| | * 5.6.25-73.1Sergei Golubchik2015-08-012-7/+4
* | | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-2/+3
|\ \ \ | |/ /
| * | Fix test case innodb.xa_recovery crash on xtradb.Jan Lindström2015-06-161-2/+3
* | | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011-0/+5
|\ \ \ | |/ /
| * | XtraDB-5.6.23-72.1Sergei Golubchik2015-05-051-0/+5
| |\ \ | | |/
| | * 5.6.23-72.1Sergei Golubchik2015-05-041-0/+5
| | * move to storage/xtradbSergei Golubchik2015-05-048-0/+12475
* | 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 bb-10.1-mergeSergei Golubchik2014-12-025-27/+20
|\ \ | |/
| * XtraDB 5.6.21-70.0Sergei 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/+61
|\ \ | |/
| * XtraDB 5.6.20-68.0Sergei Golubchik2014-09-111-11/+11
| * xtradb-5.6.19-67.0Sergei Golubchik2014-08-062-3/+35
| * MDEV-5262, MDEV-5914, MDEV-5941, MDEV-6020: Deadlocks during parallel replica...Kristian Nielsen2014-07-091-5/+5
| * 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-20/+12
* | fixing embedded: WaaS. Wsrep as a Service.Sergei Golubchik2014-10-013-2/+8
* | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-263-1/+192
|/
* xtradb 5.6.17-65.0Sergei Golubchik2014-05-071-1/+2
* MDEV-6184 10.0.11 mergeSergei Golubchik2014-05-061-0/+14
* Percona-Server-5.6.15-rel63.0.tar.gz mergeSergei Golubchik2014-02-263-10/+30
* Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-2210-5776/+5417
* 5.5 mergeSergei Golubchik2013-11-231-21/+6
|\
| * Percona-Server-5.5.34-rel32.0 mergeSergei Golubchik2013-11-191-21/+6
* | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-185-13/+13
|\ \ | |/
| * Percona-Server-5.5.33-rel31.1.tar.gzSergei Golubchik2013-09-075-13/+13
* | merge 5.5 -> 10.0-baseunknown2013-08-201-3/+5
|\ \ | |/
| * Revert reverted patch (as workaround) to have no problem with ongoing fix.unknown2013-07-191-3/+5
* | 5.5 mergeSergei Golubchik2013-07-172-4/+19
|\ \ | |/
| * Revert of marko.makela@oracle.com-20130430103950-j353faze84zzk9xf for xtradbunknown2013-07-171-5/+3