summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* 5.3 mergeSergei Golubchik2012-02-212-20/+8
|\
| * Merge with MariaDB 5.2Michael Widenius2012-02-211-2/+5
| |\
| | * Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria check...Michael Widenius2012-02-201-2/+5
| | * compilation warning - unused variableSergei Golubchik2011-12-221-1/+1
| * | Remove engine-specific (but identical) icp callbacks. create one reusableSergei Golubchik2012-02-171-24/+3
| * | Counters for Index Condition Pushdown added (MDEV-130).unknown2012-02-161-1/+7
* | | fix the include guards and add missing gplv2 headersSergei Golubchik2012-02-172-0/+32
* | | Fixed tests consumed big amount of disk space to be "BIG".unknown2012-01-273-4/+18
* | | 5.3 mergeSergei Golubchik2012-01-1315-137/+165
|\ \ \ | |/ /
| * | Fix unused variable 'thd' error.Sergey Petrunya2011-12-151-1/+1
| * | Merge with 5.2Michael Widenius2011-12-144-5/+21
| |\ \ | | |/
| | * Fixed bug: lp:887051 ; Error in recovery with LOAD DATA + DELETEMichael Widenius2011-12-134-5/+21
| * | 5.2->5.3 mergeSergei Golubchik2011-12-121-96/+96
| |\ \ | | |/
| | * update testsSergei Golubchik2011-12-031-96/+96
| * | Merge with 5.2.Michael Widenius2011-12-1113-36/+48
| |\ \ | | |/
| | * 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
| | * Merge with 5.1Michael Widenius2011-11-304-4/+5
| | |\
| | | * Fixed compiler warningsMichael Widenius2011-11-304-4/+5
| | * | 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-291-2/+2
| | | * Fixed that one can use --maria-recover=backup,forceMichael Widenius2011-11-242-3/+3
| | * | merge, fix Windows warningsVladislav Vaintroub2011-11-291-1/+1
| | * | Automatic mergeMichael Widenius2011-11-245-10/+14
| | |\ \
| | | * \ Merge with MariaDB 5.1Michael Widenius2011-11-2412-35/+28
| | | |\ \ | | | | |/
| | | | * Fixes for build failuers found by buildbotMichael Widenius2011-11-241-0/+2
| | | | * Merge with MySQL 5.1.60Michael Widenius2011-11-234-7/+7
| | | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-3/+5
| * | | | 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
* | | | | Fix Aria unit tests on Windows.Vladislav Vaintroub2011-11-301-2/+14
* | | | | mergeVladislav Vaintroub2011-11-282-6/+3
|\ \ \ \ \
| * | | | | compiler warnings/errorsSergei Golubchik2011-11-232-6/+3
* | | | | | Fix MariaDB wasnings on Windows (rmdir not defined unless direct.h is included)Vladislav Vaintroub2011-11-262-1/+6
|/ / / / /
* | | | | 5.3->5.5 mergeSergei Golubchik2011-11-2219-90/+133
|\ \ \ \ \ | |/ / / /
| * | | | 5.2->5.3 mergeSergei Golubchik2011-11-124-5/+20
| |\ \ \ \ | | |/ / /
| | * | | Fix gcc 4.6 warning after merge with 5.1unknown2011-10-272-3/+9
| | * | | 5.1->5.2 merge (gcc 4.6 warnings and apple hwaddress fixes).unknown2011-10-279-25/+14
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Fix gcc 4.6 warnings about assigned but not used variables.unknown2011-10-279-25/+14
| * | | Merge.Igor Babaev2011-11-061-2/+2
| |\ \ \
| | * | | Fix "unused variable addr" warningSergey Petrunya2011-11-021-2/+2
| * | | | Backported the fix and the test case for bug #58816 from mysql-5.6 code line.Igor Babaev2011-10-291-3/+0
| |/ / /
| * | | Fixed lp:879939 "assertion in ha_maria::enable_indexes with derived_with_keys...Michael Widenius2011-10-267-6/+21
| * | | Compiler warning about assigned but not used variables fixed.unknown2011-10-1810-36/+15
| * | | mergeSergei Golubchik2011-10-113-14/+12
| |\ \ \ | | |/ /
| | * | merge with 5.1Sergei Golubchik2011-10-073-14/+12
| | |\ \ | | | |/
| | | * support for plugins on windowsSergei Golubchik2011-10-042-13/+12
| | | * remove redundant declarationsSergei Golubchik2011-10-041-1/+0