summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'"Michael Widenius2012-02-284-5/+14
* Automatic mergeMichael Widenius2012-02-241-3/+9
|\
| * Fix for lp:909635: MariaDB crashes on a select with long varchar and blob fieldsMichael Widenius2012-02-241-3/+9
* | Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-2011-19/+66
|\ \ | |/
| * Merge with MYSQL 5.1.61Michael Widenius2012-02-2011-19/+66
| |\
| | * merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-12-155-3/+18
| | |\
| | | * Bug #13117023: Innodb increments handler_read_key when it should notAnnamalai Gurusami2011-12-133-2/+6
| | | * Bug#13418887 ERROR IN DIAGNOSTIC FUNCTION PAGE_REC_PRINT()Marko Mäkelä2011-12-123-1/+12
| | * | mergeMattias Jonsson2011-12-141-0/+3
| | * | merge 5.1->5.1-security.Georgi Kodinov2011-12-1212-78/+137
| | |\ \ | | | |/
| | | * Bug#11756764 48726: MYSQLD KEEPS CRASHING WITH SIGSEGVNirbhay Choubey2011-11-292-4/+10
| | | * BUG#11751793 - 42784: ARCHIVE TABLES CAUSE 100% CPU USAGEAshish Agarwal2011-11-231-9/+39
| | * | auto-merge mysql-5.1->mysql-5.5Georgi Kodinov2011-11-042-1/+7
| | |\ \
* | | | | Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria check...Michael Widenius2012-02-201-2/+5
* | | | | on windows: don't link all plugins with mysqld, only do it for storage engines.Sergei Golubchik2011-12-291-1/+3
* | | | | LPBUG#906638 : Fixes to build oqgraph with boost 1.48 Vladislav Vaintroub2011-12-221-7/+7
* | | | | compilation warning - unused variableSergei Golubchik2011-12-221-1/+1
* | | | | 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
* | | | | update testsSergei Golubchik2011-12-031-96/+96
* | | | | 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
| | | |/