summaryrefslogtreecommitdiff
path: root/storage/innobase/trx
Commit message (Expand)AuthorAgeFilesLines
* 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-185-10/+10
|\
| * mysql-5.5.33 mergeSergei Golubchik2013-09-065-10/+10
| |\
| | * Fixing the bug 16919882 - WRONG FSF ADDRESS IN LICENSES HEADERSMurthy Narkedimilli2013-06-105-10/+10
* | | 5.5 mergeSergei Golubchik2013-07-171-3/+5
|\ \ \ | |/ /
| * | mysql-5.5.32 mergeSergei Golubchik2013-07-161-3/+5
| |\ \ | | |/
| | * Bug#16720368 INNODB IGNORES *.IBD FILE BREAKAGE AT STARTUPMarko Mäkelä2013-04-301-3/+5
* | | 5.5 mergeSergei Golubchik2013-06-061-1/+1
|\ \ \ | |/ /
| * | mysql-5.5.31 mergeSergei Golubchik2013-05-071-1/+1
| |\ \ | | |/
| | * Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2013-02-081-1/+1
| | |\
* | | \ 5.5 mergeSergei Golubchik2013-03-272-0/+37
|\ \ \ \ | |/ / /
| * | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-282-0/+37
| |\ \ \ | | |/ /
| | * | UNIV_DEBUG build of some environments needsYasufumi Kinoshita2012-12-041-0/+1
| | * | Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN...Yasufumi Kinoshita2012-11-281-0/+10
| | |\ \ | | | |/
| | | * Bug#59354 : Bug #12659252 : ASSERT !OTHER_LOCK AT LOCK_REC_ADD_TO_QUEUE DURIN...Yasufumi Kinoshita2012-11-281-0/+11
| | * | Bug #14676249 : ROW_VERS_IMPL_X_LOCKED_LOW() MIGHT HIT !BPAGE->FILE_PAGE_WAS_...Yasufumi Kinoshita2012-11-261-0/+19
| | |\ \ | | | |/
| | * | Bug #14676111 WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT BTR_LIFT...Yasufumi Kinoshita2012-11-121-0/+7
| | |\ \ | | | |/
| | | * Bug #14676111 WRONG PAGE_LEVEL WRITTEN FOR UPPER THAN FATHER PAGE AT BTR_LIFT...Yasufumi Kinoshita2012-11-121-0/+2
* | | | 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
* | | 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
| | * | Revert most of revno 3560.9.1 (Bug#12704861)Marko Mäkelä2011-10-261-1/+1
* | | | mysql-5.5.18 mergeSergei Golubchik2011-11-032-55/+81
|\ \ \ \ | |/ / /
| * | | Revert original fix for Bug 12612184 and the follow up fix forInaam Rana2011-09-302-4/+4
| * | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-09-061-12/+15
| |\ \ \ | | |/ /
| * | | Bug#12547647 UPDATE LOGGING COULD EXCEED LOG PAGE SIZEMarko Mäkelä2011-09-012-56/+79
| * | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-08-291-2/+2
| |\ \ \ | | |/ /
| | * | Bug#12704861 Corruption after a crash during BLOB updateMarko Mäkelä2011-08-291-1/+1
| | * | Re-enable the debug assertions for Bug#12650861.Marko Mäkelä2011-06-161-2/+2
* | | | merge with 5.3Sergei Golubchik2011-10-193-26/+12
|\ \ \ \
* \ \ \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-151-2/+2
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Introduce UNIV_BLOB_NULL_DEBUG for temporarily hiding Bug#12650861.Marko Mäkelä2011-06-151-2/+2
* | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-091-1/+5
|\ \ \ \ | |/ / /
| * | | BLOB instrumentation for Bug#12612184 Race condition in row_upd_clust_rec()Marko Mäkelä2011-06-091-0/+4
| | |/ | |/|
* | | Implement worklog #5743 InnoDB: Lift the limit of index key prefixes. Jimmy Yang2011-05-311-18/+40
* | | Fix a bogus UNIV_SYNC_DEBUG failure in the fix of Bug #59641Marko Mäkelä2011-05-181-3/+0
* | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-04-113-1/+105
|\ \ \ | |/ /
| * | Bug #11766513 - 59641: Prepared XA transaction in system after hard crashMarko Mäkelä2011-04-071-0/+11
| |/
* | Bug 12323643 - CLEAN UP THE INNODB THREAD SHUTDOWN AND ASSERTIONS (WL#5136)Marko Mäkelä2011-04-052-14/+0
* | Merge mysql-5.1-innodb -> mysql-5.5-innodbVasil Dimov2011-03-281-1/+1
|\ \ | |/