summaryrefslogtreecommitdiff
path: root/storage/innobase
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2012-01-1324-513/+366
|\
| * Merge with 5.2.Michael Widenius2011-12-1139-473/+447
| |\
| | * Merge with MySQL 5.1.60Michael Widenius2011-11-2331-979/+277
| | |\
| | | * Merge from mysql-5.1.60-releaseKaren Langford2011-11-1719-662/+225
| | | |\
| | | | * Revert revno:3452.71.32 (Bug#12612184 fix).Marko Mäkelä2011-10-2611-262/+101
| | | | * Revert most of revno 3560.9.1 (Bug#12704861)Marko Mäkelä2011-10-2613-455/+174
| | | | * Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE VECTORMarko Mäkelä2011-10-252-10/+15
| | | * | Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEYMarko Mäkelä2011-11-102-12/+10
| | | * | Add debug assertions to catch Bug#13345378 earlier.Marko Mäkelä2011-11-071-0/+8
| | | |/
| | | * Bug#13116045 Compilation failure using GCC 4.6.1 in btr/btr0cur.cMarko Mäkelä2011-10-211-13/+5
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2139-336/+1012
| | |\ \
| * | \ \ mergeSergei Golubchik2011-10-111-1/+0
| |\ \ \ \ | | |/ / /
| | * | | remove redundant declarationsSergei Golubchik2011-10-041-1/+0
* | | | | mergeSergei Golubchik2011-11-031-0/+3
|\ \ \ \ \
| * | | | | build on windowsSergei Golubchik2011-11-021-0/+3
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-0367-1768/+2053
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-10-052-0/+4
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Add InnoDB UNIV_SYNC_DEBUG assertions to rw-lock code.Marko Mäkelä2011-10-052-0/+4
| * | | | | Merge from mysql-5.1 to mysql-5.5unknown2011-10-042-3/+8
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#12980094 and Bug#13034534unknown2011-10-042-4/+9
| * | | | | Revert original fix for Bug 12612184 and the follow up fix forInaam Rana2011-09-3031-859/+367
| * | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-09-261-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#12963823 CRASH IN PURGE THREAD UNDER UNUSUAL CIRCUMSTANCESMarko Mäkelä2011-09-221-6/+8
| | * | | | Merge from mysql-5.1.59-releaseunknown2011-09-1511-280/+6
| | |\ \ \ \
| * | \ \ \ \ merge from 5.5.16Daniel Fischer2011-09-2110-233/+49
| |\ \ \ \ \ \
| | * | | | | | Merging into mysql-5.5.16-release.Mats Kindahl2011-08-152-8/+37
| | * | | | | | Merge mysql-5.1-security to mysql-5.5-security.Marko Mäkelä2011-08-1010-252/+79
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Bug#12626794 61240: UNUSED FUNCTIONS ...Marko Mäkelä2011-08-1011-280/+6
| * | | | | | | Bug 12963823 - Crash in Purge thread under unusual circumstances.unknown2011-09-201-9/+11
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-09-141-2/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2011-09-131-8/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-09-131-2/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Hopefully final fix of Bug#11766591 59733: Possible deadlockMarko Mäkelä2011-09-131-2/+2
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-09-121-4/+13
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2011-09-091-1/+7
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-09-085-47/+43
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#11766591 59733: POSSIBLE DEADLOCK WHEN BUFFERED CHANGES ARE DISCARDEDMarko Mäkelä2011-09-081-4/+4
| * | | | | | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2011-09-071-10/+19
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Bug#11766305 - 59392: Remove thr0loc.c and ibuf_inside() - cleanupMarko Mäkelä2011-09-062-2/+0
| * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-09-062-13/+16
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Bug#12547647 UPDATE LOGGING COULD EXCEED LOG PAGE SIZEMarko Mäkelä2011-09-017-63/+126
| * | | | | | Fix Bug 12922077 - SEGV IN DICT_SET_CORRUPTED_INDEX_CACHE_ONLY(), DROP TABLEJimmy Yang2011-08-293-4/+14
| * | | | | | Merge mysql-5.5 to working copy.Marko Mäkelä2011-08-291-3/+2
| |\ \ \ \ \ \
| | * | | | | | Fix Bug #12882177 - INSTRUMENTATION IN PFS_MUTEX_ENTER_NOWAIT_FUNC IS INCORRECTJimmy Yang2011-08-291-3/+2
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-08-2915-290/+531
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | Bug#12704861 Corruption after a crash during BLOB updateMarko Mäkelä2011-08-2915-212/+471
| | | |/ / / | | |/| | |
| * | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-08-221-1/+7
| |\ \ \ \ \ | | |/ / / /
| * | | | | In innobase_format_name() we should call innobase_convert_name() withJimmy Yang2011-08-171-1/+3
| * | | | | Add two tests for "innodb_large_prefix" and "innodb_force_load_corrupted" inJimmy Yang2011-08-161-2/+0
| * | | | | Fix bug #11830883, SUPPORT "CORRUPTED" BIT FOR INNODB TABLES AND INDEXES.Jimmy Yang2011-08-1623-52/+686
View Lorry Controller Status