summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Bug#12584374 LOCK_VALIDATE TRIPS ASSERTION !BLOCK->PAGE.FILE_PAGE_WAS_FREEMarko Mäkelä2011-05-241-29/+26
* Bug#12584374 LOCK_VALIDATE TRIPS ASSERTION !BLOCK->PAGE.FILE_PAGE_WAS_FREEDMarko Mäkelä2011-05-246-128/+152
* Backport an InnoDB Bug #58815 (Bug #11765812) work-around from mysql-trunk:Marko Mäkelä2011-05-243-8/+23
* Merge mysql-5.5-innodb -> mysql-5.5Vasil Dimov2011-05-2210-56/+131
|\
| * Fix a bogus UNIV_SYNC_DEBUG failure in the fix of Bug #59641Marko Mäkelä2011-05-181-3/+0
| * Bug#12543706 - innodb-fast-shutdown=2: AssertMarko Mäkelä2011-05-171-1/+2
| * A non-functional change related to Bug#11830883Marko Mäkelä2011-05-095-39/+36
| * Merge from mysql-5.1-innodb to mysql-5.5-innodbJimmy Yang2011-05-042-10/+83
| |\
| | * Fix bug #11796673 address backward compatibility on index withJimmy Yang2011-05-042-12/+115
| * | Fix bug #12424282 - INNODB PERFORMANCE SCHEMA: Double accounting for OS_AIO_SYNCJimmy Yang2011-05-041-3/+10
* | | merge from latest 5.5Guilhem Bichot2011-05-211-2/+2
|\ \ \
| * \ \ mergeMikael Ronström2011-05-122-20/+24
| |\ \ \
| * \ \ \ mergeMikael Ronstrom2011-05-0440-545/+594
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge 5.5, step 3Mikael Ronström2011-04-154-4/+2
| * | | | Merge 5.5Mikael Ronström2011-04-1555-1084/+965
| |\ \ \ \
| * \ \ \ \ mergeMikael Ronstrom2011-03-0442-413/+2007
| |\ \ \ \ \
| * \ \ \ \ \ mergeMikael Ronström2011-02-1046-562/+1035
| |\ \ \ \ \ \
| * \ \ \ \ \ \ mergeMikael Ronstrom2011-01-201-2/+2
| |\ \ \ \ \ \ \
| * | | | | | | | Removed dependency no longer correctMikael Ronstrom2011-01-123-17/+0
| * | | | | | | | mergeMikael Ronstrom2011-01-1263-818/+1571
| |\ \ \ \ \ \ \ \
| * | | | | | | | | BUG#59392, removed thread local storage use in MySQL Threads by storing ibuf_...Mikael Ronstrom2011-01-1213-125/+65
| * | | | | | | | | mergeMikael Ronstrom2011-01-04305-26762/+4185
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added more wait states for THD wait serviceMikael Ronstrom2010-10-271-2/+2
* | | | | | | | | | | Merge from 5.1.Guilhem Bichot2011-05-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Merge from mysql-5.1.57-releaseKaren Langford2011-05-061-1/+1
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ merged mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-04-0720-130/+327
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ merge 5.1->5.1-securityGeorgi Kodinov2011-03-0917-14/+943
| | |\ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ Merge from mysql-5.5.12-releaseunknown2011-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ merge 5.5->5.5-securityGeorgi Kodinov2011-04-0744-1156/+949
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-172-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-03-0952-417/+2036
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge.Sergey Vojtovich2011-03-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | / / / / | | |_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | BUG#11764339 - valgrind errors, random data when returningSergey Vojtovich2011-03-031-1/+1
* | | | | | | | | | | | | | | | BUG#11762616: BUG#55229: 'POSTION'Luis Soares2011-05-062-19/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | BUG#11762616: BUG#55229: 'POSTION' Luis Soares2011-05-062-19/+23
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-05-0214-152/+275
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql-5.5-innodb -> mysql-5.5Vasil Dimov2011-05-028-32/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Bug#60309 - Bug#12356829: MYSQL 5.5.9 FOR MAC OSX HAS BUG WITH FOREIGN KEY C...unknown2011-04-268-32/+43
* | | | | | | | | | | | | | | | mergeMattias Jonsson2011-04-236-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Manual merge from 5.1Mattias Jonsson2011-04-206-10/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | / / / / / / / / | | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | mergeMattias Jonsson2011-04-206-12/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Bug#11766249 bug#59316: PARTITIONING AND INDEX_MERGE MEMORY LEAKMattias Jonsson2011-03-256-12/+12
| | | | |_|_|_|_|/ / / / / / | | | |/| | | | | | | | | |
* | | | | | | | | | | | | | Merge mysql-5.5-innodb -> mysql-5.5Vasil Dimov2011-04-2130-526/+546
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Clarify a comment.Marko Mäkelä2011-04-201-2/+2
| * | | | | | | | | | | | | Remove a debug printout that is no longer needed.Marko Mäkelä2011-04-201-12/+1
| * | | | | | | | | | | | | Bug #12329920 ASSERT UT_ERROR IN SYNC_THREAD_LEVELS_NONEMPTY_TRXMarko Mäkelä2011-04-121-22/+22
| * | | | | | | | | | | | | Merge mysql-5.1-innodb to mysql-5.5-innodb.Marko Mäkelä2011-04-119-78/+199
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | Bug #11760042 - 52409: Assertion failure: long semaphore waitMarko Mäkelä2011-04-115-138/+108
| | * | | | | | | | | | | | Bug #11766513 - 59641: Prepared XA transaction in system after hard crashMarko Mäkelä2011-04-0712-14/+167
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-04-0414-129/+234
| | |\ \ \ \ \ \ \ \ \ \ \