summaryrefslogtreecommitdiff
path: root/storage/innobase
Commit message (Expand)AuthorAgeFilesLines
* mysql-5.5 mergeSergei Golubchik2012-01-1638-661/+763
|\
| * Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLESVasil Dimov2011-12-294-43/+55
| * Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLESVasil Dimov2011-12-293-33/+76
| * Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLESVasil Dimov2011-12-295-23/+45
| * Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLESVasil Dimov2011-12-296-20/+70
| * Partial fix for Bug#11764622 57480: MEMORY LEAK WHEN HAVING 256+ TABLESVasil Dimov2011-12-291-1/+1
| * Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-12-287-140/+8
| |\
| | * Bug#13418934 REMOVE HAVE_PURIFY DEPENDENCES FROM INNODBMarko Mäkelä2011-12-288-162/+8
| * | merge from mysql-5.1Inaam Rana2011-12-211-1/+1
| |\ \ | | |/
| | * Bug#11866367 FPE WHEN SETTING INNODB_SPIN_WAIT_DELAYInaam Rana2011-12-211-1/+1
| * | Merging from mysql-5.1 to mysql-5.5. Annamalai Gurusami2011-12-131-1/+0
| |\ \ | | |/
| | * Bug #13117023: Innodb increments handler_read_key when it should notAnnamalai Gurusami2011-12-131-1/+0
| * | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-12-122-1/+7
| |\ \ | | |/
| * | Bug #13116225 LIVE DOWNGRADE CRASHES WITH INNODB_PAGE_SIZE=4Kunknown2011-12-087-92/+193
| * | Fix Bug #13083023 - 60229: BROKEN COMPATIBILITY: ERROR WHILE CREATE TABLEJimmy Yang2011-12-071-0/+5
| * | Bug#11759044 - 51325: DROPPING AN EMPTY INNODB TABLE TAKES A LONG TIMEInaam Rana2011-12-075-76/+159
| * | merge from mysql-5.1Inaam Rana2011-12-011-2/+4
| |\ \ | | |/
| * | Followup to vasil.dimov@oracle.com-20111118115710-1xlezv0nbjz6s2psVasil Dimov2011-11-212-5/+0
| * | Bug#13340047 LATCHING ORDER VIOLATION IN IBUF_SET_ENTRY_COUNTER() - cleanupMarko Mäkelä2011-11-222-33/+0
| * | Fix Bug #13405367 - 60212 SERVER CRASH WITH CORRUPT FETCH BUFFERJimmy Yang2011-11-201-4/+4
| * | merge bug#13390506 from mysql-5.1Inaam Rana2011-11-181-0/+18
| * | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2011-11-182-0/+5
| |\ \ | | |/
| * | Merge from mysql-5.5.18-releaseunknown2011-11-172-11/+15
| |\ \
| | * \ Merge mysql-5.1-security to mysql-5.5-security.Marko Mäkelä2011-10-252-11/+15
| | |\ \
| * | \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-11-102-13/+11
| |\ \ \ \
| * \ \ \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-11-083-40/+2
| |\ \ \ \ \
| * | | | | | Replace void pointer arithmetics with byte pointer arithmetics.Marko Mäkelä2011-11-081-2/+2
| * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-11-071-0/+8
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Bug#13340047 LATCHING ORDER VIOLATION IN IBUF_SET_ENTRY_COUNTER()Marko Mäkelä2011-11-071-188/+127
| * | | | | | Fix Bug #12941439 - WITH UNIV_SYNC_DEBUG, PERF SCHEMA, INITIALIZATIONJimmy Yang2011-11-031-4/+21
| * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-10-271-1/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Fix Bug #11835889 - INNODB ASSERTS ON BAD FILE READ, INDEX TRANSLATIONJimmy Yang2011-10-271-8/+11
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Fix Bug #12885783 - BLOCK LOADING TABLE WITH LARGE COLLATION NUMBERJimmy Yang2011-09-074-11/+55
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-10-211-10/+4
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-10-1216-424/+276
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ 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