summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* mysql-5.5.18 mergeSergei Golubchik2011-11-03206-3609/+2576
|\
| * 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-054-0/+8
| | * Correct the ChangeLogMarko Mäkelä2011-10-041-3/+4
| * | Merge from mysql-5.1 to mysql-5.5unknown2011-10-042-3/+8
| |\ \ | | |/
| | * Bug#12980094 and Bug#13034534unknown2011-10-045-5/+20
| * | Revert original fix for Bug 12612184 and the follow up fix forInaam Rana2011-09-3031-859/+367
| * | Bug#11759349 -- Merge of patch from mysql-5.1.Ashish Agarwal2011-09-273-0/+3
| |\ \ | | |/
| | * BUG#11759349 - 51655: CREATE TABLE IN MEMORY ENGINE DOESN'T STOREAshish Agarwal2011-09-273-0/+3
| | * merge from 5.1 mainBjorn Munch2011-09-2627-521/+47
| | |\
| | * \ merge from 5.1 main minus merge jam pushesBjorn Munch2011-09-2011-83/+120
| | |\ \
| | * | | Bug #11750417 40942: UNABLE TO INSTALL FEDERATED PLUGINBjorn Munch2011-09-051-2/+2
| * | | | 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-223-7/+15
| | * | | Bug 12963823 - Crash in Purge thread under unusual circumstances.unknown2011-09-201-8/+9
| | * | | Merge.Sergey Vojtovich2011-09-164-5/+5
| | |\ \ \
| | * \ \ \ Merge from mysql-5.1.59-releaseunknown2011-09-1520-501/+18
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | merge from 5.5.16Daniel Fischer2011-09-2119-242/+67
| |\ \ \ \ \
| | * | | | | Merging into mysql-5.5.16-release.Mats Kindahl2011-08-1511-17/+55
| | * | | | | 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-1020-504/+21
| * | | | | | Bug 12963823 - Crash in Purge thread under unusual circumstances.unknown2011-09-201-9/+11
| * | | | | | Merge.Sergey Vojtovich2011-09-164-5/+5
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | BUG#11761180 - 53646: MYISAMPACK CORRUPTS TABLES WITHSergey Vojtovich2011-09-164-5/+5
| * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-09-141-2/+1
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Hopefully really final fix of Bug#11766591 59733: Possible deadlockMarko Mäkelä2011-09-141-2/+1
| * | | | | | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2011-09-131-8/+4
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Re-enable the prefetch code in InnoDB internal SQL parser and fix twoVasil 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-132-4/+4
| * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-09-121-4/+13
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#12601439 CONSISTENT READ FAILURE IN COLUMN PREFIX INDEXMarko Mäkelä2011-09-122-3/+22
| * | | | | | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2011-09-091-1/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Disable the prefetch code in the InnoDB internal SQL parser.Vasil Dimov2011-09-091-1/+7
| * | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-09-085-47/+43
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#12948130 UNNECESSARY X-LOCKING OF ADAPTIVE HASH INDEX (BTR_SEARCH_LATCH)Marko Mäkelä2011-09-084-38/+38
| | * | | | | Bug#11766591 59733: POSSIBLE DEADLOCK WHEN BUFFERED CHANGES ARE DISCARDEDMarko Mäkelä2011-09-082-9/+8
| * | | | | | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2011-09-071-10/+19
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Use cursors for seeking records in SYS_FOREIGN and SYS_INDEXES fromVasil 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 #12950803 62294: BUF_BUDDY_RELOCATE CALLS GETTIMEOFDAY ...Marko Mäkelä2011-09-062-1/+7
| | * | | | | Bug#12547647 UPDATE LOGGING COULD EXCEED LOG PAGE SIZE - take 2Marko Mäkelä2011-09-062-17/+20
| | | |_|_|/ | | |/| | |
| * | | | | 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-2933-558/+1132
| * | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-08-221-1/+7
| |\ \ \ \ \ | | |/ / / /