summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Updated/added copyright headersKent Boortz2011-06-30127-207/+427
|\
| * Updated/added copyright headersKent Boortz2011-06-30107-171/+539
* | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-091-1/+5
|\ \
| * | Disable a debug assertion that was added to track down Bug#12612184.Marko Mäkelä2011-06-092-2/+10
* | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-096-6/+88
|\ \ \ | |/ /
| * | BLOB instrumentation for Bug#12612184 Race condition in row_upd_clust_rec()Marko Mäkelä2011-06-0915-6/+188
* | | Auto-merge from mysql-5.1Ramil Kalimullin2011-06-072-5/+6
|\ \ \ | |/ /
| * | Bug#11764487: myisam corruption with insert ignore and invalid spatial dataRamil Kalimullin2011-06-072-5/+6
* | | Non-functional change: Unbreak the Hot Backup build.Marko Mäkelä2011-06-062-1/+5
* | | Increment InnoDB version from 1.1.7 to 1.1.8Vasil Dimov2011-06-031-1/+1
* | | Merge.Sergey Vojtovich2011-06-032-1/+11
|\ \ \ | |/ /
| * | Merge.Sergey Vojtovich2011-06-032-1/+11
| |\ \
| | * | BUG#12402794 - 60976: CRASH, VALGRIND WARNING AND MEMORYSergey Vojtovich2011-05-182-1/+11
| * | | Fix for bug #11762012 - "54553: INNODB ASSERTS IN Dmitry Lenev2011-05-262-4/+20
| * | | Merge mysql-5.1-innodb -> mysql-5.1Vasil Dimov2011-05-223-13/+116
| |\ \ \ | | |/ / | |/| |
| | * | Increment InnoDB Plugin version from 1.0.16 to 1.0.17.Vasil Dimov2011-05-101-1/+1
* | | | Bug#11853126 RE-ENABLE CONCURRENT READS WHILE CREATINGJon Olav Hauglid2011-06-013-96/+192
* | | | Implement worklog #5743 InnoDB: Lift the limit of index key prefixes. Jimmy Yang2011-05-3122-83/+287
* | | | Bug#12606344 - ADD VALGRIND DIAGNOSTICS TO MTR_START, MTR_COMMITMarko Mäkelä2011-05-312-1/+14
* | | | 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-releasebjorn.munch@oracle.com2011-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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \