summaryrefslogtreecommitdiff
path: root/storage/xtradb/include/trx0trx.h
Commit message (Expand)AuthorAgeFilesLines
* Merge XtraDB from Percona-Server-5.5.20-24.1 into MariaDB 5.5.unknown2012-02-151-0/+1
* Merge XtraDB from Percona-server-5.5.17-rel22.1 into MariaDB 5.5unknown2011-12-151-0/+3
* merge with 5.3Sergei Golubchik2011-10-191-1/+5
|\
| * Merge with MariaDB 5.2Michael Widenius2011-05-101-2/+2
| |\
| | * Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.unknown2011-04-291-2/+2
| * | Change lock release to assert in XtraDB commit_ordered(); we never want tounknown2011-04-071-2/+2
| * | MWL#116: Efficient group commitunknown2010-10-041-3/+8
| |/
* | merge with xtradb-5.5.15Sergei Golubchik2011-07-181-29/+34
|/
* Merge XtraDB from Percona server 5.1.49-12 into MariaDB.unknown2010-09-031-3/+1
* Merge XtraDB from Percona-Server-5.1.47-11 into MariaDB.unknown2010-08-041-35/+46
* Merge XtraDB 9 into MariaDB.unknown2010-01-151-2/+13
* Merge XtraDB 8 into MariaDB.unknown2009-11-131-198/+209
* Merge xtradb-7 -> MariaDBSergey Petrunya2009-09-081-42/+0
* Merge latest XtraDB from lp:percona-xtradb into MariaDB.unknown2009-06-111-0/+15
* Import Percona XtraDB into the MariaDB source tree.unknown2009-06-091-0/+845