summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2012-01-1391-739/+688
|\
| * MDEV-77 - possible deadlock in XtraDB async io subsystem on Windows.Vladislav Vaintroub2012-01-081-11/+45
| * Fix unused variable 'thd' error.Sergey Petrunya2011-12-151-1/+1
| * Merge with 5.2Michael Widenius2011-12-145-9/+25
| |\
| | * Merge with 5.1Michael Widenius2011-12-131-4/+4
| | |\
| | | * Fix GCC build failure in PBXT in some cases/platforms.unknown2011-12-121-4/+4
| | * | Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETEMichael Widenius2011-12-134-5/+21
| * | | 5.2->5.3 mergeSergei Golubchik2011-12-122-97/+97
| |\ \ \ | | |/ /
| | * | update testsSergei Golubchik2011-12-031-96/+96
| * | | Merge with 5.2.Michael Widenius2011-12-11334-6377/+7594
| |\ \ \ | | |/ /
| | * | Fixed buildbot warningsMichael Widenius2011-12-031-2/+1
| | * | Fixed some Aria limits to be more saneMichael Widenius2011-12-021-3/+3
| | * | Fixed bug where automaticly zerofilled table was not part of recovery if cras...Michael Widenius2011-12-024-1/+11
| | * | Fixed compiler warningMichael Widenius2011-12-011-0/+2
| | * | Merge with 5.1Michael Widenius2011-11-3010-23/+30
| | |\ \ | | | |/
| | | * Fixed compiler warning and errorsMichael Widenius2011-11-301-2/+2
| | | * Fixed compiler warnings and other bugs found by buildbot.Michael Widenius2011-11-301-1/+1
| | | * test both federated and federatedX in the federated suite.Sergei Golubchik2011-11-301-1/+1
| | | * Cherrypick into XtraDB: Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE V...unknown2011-11-303-11/+20
| | | * Fixed compiler warningsMichael Widenius2011-11-307-8/+7
| | * | Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-295-19/+16
| | |\ \ | | | |/
| | | * Fixed that maria-recover works as expected.Michael Widenius2011-11-293-12/+9
| | | * Fix Windows build, and a conversion truncation warning.Vladislav Vaintroub2011-11-294-9/+8
| | | * Fixed that one can use --maria-recover=backup,forceMichael Widenius2011-11-242-3/+3
| | * | merge, fix Windows warningsVladislav Vaintroub2011-11-294-4/+4
| | * | after merge fixesSergei Golubchik2011-11-282-6/+6
| | * | Automatic mergeMichael Widenius2011-11-24325-6335/+7537
| | |\ \
| | | * \ Merge with MariaDB 5.1Michael Widenius2011-11-24341-6406/+7607
| | | |\ \ | | | | |/
| | | | * Fixes for build failuers found by buildbotMichael Widenius2011-11-241-0/+2
| | | | * Merge with MySQL 5.1.60Michael Widenius2011-11-2392-2480/+1009
| | | | |\
| | | | | * Bug#13390506 - VALGRIND FAILURE AFTER THE FIX FOR 13371000Inaam Rana2011-11-181-0/+18
| | | | | * Merge from mysql-5.1.60-releaseKaren Langford2011-11-1741-1446/+512
| | | | | |\
| | | | | | * Revert revno:3452.71.32 (Bug#12612184 fix).Marko Mäkelä2011-10-2625-597/+192
| | | | | | * Revert most of revno 3560.9.1 (Bug#12704861)Marko Mäkelä2011-10-2627-972/+415
| | | | | | * Bug#13002783 PARTIALLY UNINITIALIZED CASCADE UPDATE VECTORMarko Mäkelä2011-10-255-22/+36
| | | | | * | Bug#11759688 52020: InnoDB can still deadlock on just INSERT...ON DUPLICATE KEYMarko Mäkelä2011-11-105-25/+28
| | | | | * | Bug#13358468 ASSERTION FAILURE IN BTR_PCUR_GET_BLOCKMarko Mäkelä2011-11-084-41/+8
| | | | | * | Add debug assertions to catch Bug#13345378 earlier.Marko Mäkelä2011-11-072-0/+16
| | | | | * | Bug #12884631 62146: TABLES ARE LOST FOR DDLMarko Mäkelä2011-10-272-1/+7
| | | | | |/
| | | | | * Merge.Sergey Vojtovich2011-10-212-5/+16
| | | | | |\
| | | | | | * BUG#11757032 - 49030: OPTIMIZE TABLE BREAKS MYISAM TABLE WHENSergey Vojtovich2011-10-202-5/+16
| | | | | * | Bug#13116045 Compilation failure using GCC 4.6.1 in btr/btr0cur.cMarko Mäkelä2011-10-213-26/+15
| | | | | |/
| | | | | * Bug#13006367 62487: innodb takes 3 minutes to clean up the adaptiveMarko Mäkelä2011-10-1217-386/+272
| | | | * | Merge of XtraDB for 5.1.59Michael Widenius2011-11-2188-2954/+4335
| | | | |\ \
| | | | | * | Merge XtraDB from Percona-Server-5.1.59-13 into MariaDB 5.1.unknown2011-11-2188-2954/+4335
| | | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-21219-2757/+4045
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| * | | | | | bug 857066 Wrong result with ST_DISJOINT when using an index.Alexey Botchkov2011-11-291-1/+1
| * | | | | | bug 857066 Wrong result with ST_DISJOINT when using an indexAlexey Botchkov2011-11-291-1/+1
* | | | | | | Fix compile errorVladislav Vaintroub2012-01-031-3/+4
* | | | | | | Fix compile warningsSergey Petrunya2012-01-021-2/+2