summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge from mysql-5.5.14-releasehery.ramilison@oracle.com2011-07-064-516/+0
|\
| * merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-06-0646-363/+799
| |\
| * \ Merge mysql-5.1-security to mysql-5.5-security.Marko Mäkelä2011-05-191-2/+0
| |\ \
| | * | Bug#12429576 Assertion failure on purge of column prefix indexMarko Mäkelä2011-05-192-2/+5
| | * | weave merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-05-1022-183/+310
| | |\ \
| * | \ \ weave merge of mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-05-1044-581/+617
| |\ \ \ \
| * \ \ \ \ merge 5.1-security->5.5-securityGeorgi Kodinov2011-04-274-484/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug #11810224: CORRECT INVALID LGPL NOTICE IN CLUSTER FILES Georgi Kodinov2011-04-184-484/+0
* | | | | | Updated/added copyright headersKent Boortz2011-07-0453-1332/+945
|\ \ \ \ \ \
| * \ \ \ \ \ Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-301-3/+39
| |\ \ \ \ \ \
| | * | | | | | Bug#12637786 Wrong secondary index entries on CHAR and VARCHAR columnsMarko Mäkelä2011-06-302-3/+45
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-291-0/+2
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug #12612184 BLOB debug code cleanup: Forgot an #ifMarko Mäkelä2011-06-291-0/+2
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-296-64/+68
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug #12612184 BLOB debug code cleanup:Marko Mäkelä2011-06-299-110/+146
| * | | | | | | Bug#12699505 Memory leak in row_create_index_for_mysql()Marko Mäkelä2011-06-284-37/+5
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-281-31/+59
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug#12595087 - 61191: Question about page_zip_available (clean up page0zip.c)Marko Mäkelä2011-06-281-31/+59
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-236-49/+48
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug 12635227 - 61188: DROP TABLE EXTREMELY SLOWInaam Rana2011-06-1711-516/+276
| * | | | | | | Fix a merge error introduced in:Inaam Rana2011-06-201-3/+3
| * | | | | | | merge from mysql-5.1Inaam Rana2011-06-1710-527/+283
| * | | | | | | Merge mysql-5.1 -> mysql-5.5Vasil Dimov2011-06-161-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Silence bogus compiler warning introduced inVasil Dimov2011-06-162-2/+2
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-168-542/+81
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Bug #61341 buf_LRU_insert_zip_clean can be O(N) on LRU lengthMarko Mäkelä2011-06-167-385/+31
| | * | | | | | Bug#12595087 - 61191: Question about page_zip_availableMarko Mäkelä2011-06-163-71/+60
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-1624-151/+416
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Re-enable the debug assertions for Bug#12650861.Marko Mäkelä2011-06-1615-66/+111
| | * | | | | | Bug#12612184 Race condition after btr_cur_pessimistic_update()Marko Mäkelä2011-06-1634-223/+650
| * | | | | | | Merge mysql-5.1 to mysql-5.5.Marko Mäkelä2011-06-157-20/+22
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Introduce UNIV_BLOB_NULL_DEBUG for temporarily hiding Bug#12650861.Marko Mäkelä2011-06-1514-42/+44
| | * | | | | | Merge a fix from mysql-5.5 to mysql-5.1:Marko Mäkelä2011-06-141-3/+0
* | | | | | | | 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