summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Automatic mergeMichael Widenius2011-10-051-6/+7
|\ \ \ | |/ /
| * | Fixed lp:859051 "Periodic aria checkpoints prevent power management"Michael Widenius2011-10-051-5/+7
* | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-1/+1
* | | mergeVladislav Vaintroub2011-09-161-1/+1
|\ \ \ | |/ /
| * | Fix compile warningVladislav Vaintroub2011-09-161-1/+1
* | | Merge with 5.2Michael Widenius2011-09-151-1/+1
|\ \ \ | |/ /
| * | Increased version numberMichael Widenius2011-09-131-1/+1
* | | Merge 5.2->5.3unknown2011-09-026-47/+85
|\ \ \ | |/ /
| * | Added variable ARIA_CHECKPOINT_LOG_ACTIVITY to allow one to specify how often...Michael Widenius2011-09-017-13/+54
* | | Automatic merge with 5.2Michael Widenius2011-08-161-1/+8
|\ \ \ | |/ /
| * | Fixed recovery crash lp:814806 "Unclean shutdown corrupted Aria table blockin...Michael Widenius2011-08-151-1/+8
* | | Automatic merge with 5.2Michael Widenius2011-08-1512-62/+114
|\ \ \ | |/ /
| * | Merge in bug fix from 5.1Michael Widenius2011-08-151-1/+1
| |\ \ | | |/
| | * Fixed bug lp:826377 "Aria DB Format: Reading specific table from dump causes ...Michael Widenius2011-08-151-1/+1
| * | Fixes bugs found by testcase for lp:815022 and lp:726374 "ma_blockrec.c:3000:...Michael Widenius2011-08-159-49/+87
| * | Autmatic merge with 5.1Michael Widenius2011-08-122-5/+13
| |\ \ | | |/
| | * Fixed lp:814231 Aria post-recovery error "Bitmap at page 0 has pages reserved...Michael Widenius2011-08-122-5/+13
| * | Fixed bug lp:814054 'Assertion `block->hash_link == hash_link && hash_link->b...Michael Widenius2011-08-101-2/+8
| * | Optimize mutex usage.Michael Widenius2011-08-083-5/+5
* | | Automerge 5.2->5.3unknown2011-07-319-46/+163
|\ \ \ | |/ /
| * | Merge with 5.1Michael Widenius2011-07-259-46/+163
| |\ \ | | |/
| | * Fixes lp:805930 Sysbench breaks on multiple table test with MariaDB 5.2.7 + AriaMichael Widenius2011-07-248-49/+156
| | * Fixes to ariaMichael Widenius2011-06-241-5/+3
* | | Valgrind fix for the previous cset:Sergey Petrunya2011-07-151-0/+1
* | | BUG#778434 Wrong result with in_to_exists=on in maria-5.3-mwl89Sergey Petrunya2011-07-141-1/+8
* | | merge Windows performance patches into 5.3Vladislav Vaintroub2011-07-051-2/+1
|\ \ \
| * | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr...Vladislav Vaintroub2011-06-121-2/+1
* | | | Automatic mergeMichael Widenius2011-07-0410-32/+75
|\ \ \ \ | | |/ / | |/| |
| * | | Aria fixes:Michael Widenius2011-07-0410-32/+75
* | | | Merge with 5.2Michael Widenius2011-07-015-15/+46
|\ \ \ \ | |/ / /
| * | | Aria bug fixes and improvements:Michael Widenius2011-06-306-24/+57
| * | | Fix compile failureSergey Petrunya2011-06-241-1/+1
* | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-016-18/+137
* | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_writeMichael Widenius2011-06-271-1/+1
* | | | Merge 5.2 -> 5.3 Sergey Petrunya2011-06-248-136/+296
|\ \ \ \ | |/ / /
| * | | Fixed several errors in Aria discovered by test case for lp:727869 ma_pagecac...Michael Widenius2011-06-243-129/+252
| * | | Fixed portability problem with partiton_error.testMichael Widenius2011-06-136-7/+44