summaryrefslogtreecommitdiff
path: root/storage/xtradb/trx/trx0trx.cc
Commit message (Expand)AuthorAgeFilesLines
* Remove XtraDBMarko Mäkelä2017-06-211-2748/+0
* Merge branch '10.0-galera' into 10.1Sergei Golubchik2017-05-261-1/+2
|\
| * Fixed test failure on galere_wsrep_log_conflicts on XtraDB.Jan Lindström2017-03-201-0/+114
| * Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-171-1/+5
| |\
| * \ Merge branch '10.0' into 10.0-galeraNirbhay Choubey2016-08-241-7/+7
| |\ \
| * \ \ Merge tag 'mariadb-10.0.23' into 10.0-galeraNirbhay Choubey2015-12-191-0/+6
| |\ \ \
| * \ \ \ Merge tag 'mariadb-10.0.21' into 10.0-galeraNirbhay Choubey2015-08-081-3/+3
| |\ \ \ \
| * \ \ \ \ Merge tag 'mariadb-10.0.20' into 10.0-galeraNirbhay Choubey2015-06-211-2/+3
| |\ \ \ \ \
| * \ \ \ \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-1/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ bzr merge -r4346 maria/10.0 (maria-10.0.13)Nirbhay Choubey2014-08-111-22/+49
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-1/+16
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merging wsrep specific changes from InnoDB toNirbhay Choubey2014-03-261-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Merging InnoDB changes to xtradb (r3783..3808).Nirbhay Choubey2014-03-261-8/+6
| * | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0Nirbhay Choubey2014-03-261-15/+33
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-251-1/+42
* | | | | | | | | | | MDEV-9566 Prepare xtradb for xtrabackupVladislav Vaintroub2017-04-271-7/+17
* | | | | | | | | | | MDEV-12253: Buffer pool blocks are accessed after they have been freedJan Lindström2017-04-261-1/+1
* | | | | | | | | | | MW-28, codership/mysql-wsrep#28 Fix sync_thread_levels debug assertSachin Setiya2017-04-061-0/+112
* | | | | | | | | | | MDEV-12345 Performance : replace calls to clock() inside trx_start_low() by T...Vladislav Vaintroub2017-03-231-1/+2
* | | | | | | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-02-081-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| * | | | | | | | | | MDEV-11985 Make innodb_read_only shutdown more robustMarko Mäkelä2017-02-041-1/+5
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | MDEV-7955 WSREP() appears on radar in OLTP ROSachin Setiya2017-01-031-1/+1
* | | | | | | | | | A few fixes for VATS in 10.1sensssz2016-10-251-0/+2
* | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-7/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2016-08-101-7/+7
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | 5.6.31-77.0Sergei Golubchik2016-08-101-7/+7
* | | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-12-211-0/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'merge/merge-xtradb-5.6' into 10.0Sergei Golubchik2015-12-131-0/+6
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | 5.6.27-76.0Sergei Golubchik2015-12-131-0/+6
* | | | | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0Sergei Golubchik2015-08-031-3/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | 5.6.25-73.1Sergei Golubchik2015-08-011-3/+4
| | * | | | | | move to storage/xtradbSergei Golubchik2015-05-041-0/+2561
| | / / / / /
* | | | | | | 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 branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-1/+7
|\ \ \ \ \ \ | |/ / / / /
| * | | | | XtraDB 5.6.21-70.0Sergei Golubchik2014-11-201-1/+7
| | |_|_|/ | |/| | |
* | | | | Merge 10.0.14 into 10.1Sergei Golubchik2014-10-151-22/+49
|\ \ \ \ \ | |/ / / /
| * | | | xtradb-5.6.19-67.0Sergei Golubchik2014-08-061-2/+34
| * | | | 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-011-1/+3
* | | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-1/+42
|/ / /
* | | 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-261-8/+26
|/
* Percona-Server-5.6.14-rel62.0 mergeSergei Golubchik2013-12-221-0/+2502