summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* fix the build and compiler warnings (few of which were real bugs)Sergei Golubchik2011-10-2912-76/+28
* fixes for windowsSergei Golubchik2011-10-216-6/+6
* intptr should be unsignedSergei Golubchik2011-10-191-1/+1
* safe_mutex deadlock detector post-merge fixesSergei Golubchik2011-10-191-0/+1
* merge with 5.3Sergei Golubchik2011-10-1982-1760/+3379
|\
| * 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
| * | | | Merge of mwl #106 into 5.3. Igor Babaev2011-06-151-1/+1
| |\ \ \ \
| | * \ \ \ Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-1/+1
| | |\ \ \ \
| | | * \ \ \ MergeIgor Babaev2011-05-201-1/+1
| | | |\ \ \ \
| | | | * \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-1/+1
| | | | |\ \ \ \
| * | | | | | | | Fixed build failures with maria3.test and widows buildMichael Widenius2011-06-112-2/+3
| * | | | | | | | Merge with 5.2Michael Widenius2011-06-101-1/+2
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | A bit better fix for tmp-table problemMichael Widenius2011-06-101-1/+2
| | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Removed depricated --maria-options from mysqld.Michael Widenius2011-06-094-277/+2
| | |/ / / / / | |/| | | | |
| * | | | | | Fix compile errors and warnings and test errors introduced by microseconds push.Vladislav Vaintroub2011-05-281-1/+1
| * | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-285-22/+26
| | |/ / / / | |/| | | |
| * | | | | Fix compile warning.Vladislav Vaintroub2011-05-181-1/+1
| * | | | | Fix of compiler errors.unknown2011-05-163-1/+5
| * | | | | Merge with 5.2Michael Widenius2011-05-1618-124/+310
| |\ \ \ \ \ | | |/ / / /
| | * | | | Made test-unit run in parlallel. This was achived by having all aria tests th...Michael Widenius2011-05-1318-124/+310
| * | | | | Added more asserts to find out how maria.maria-big could have failed in build...Michael Widenius2011-05-163-4/+13
| * | | | | Merge with MariaDB 5.2Michael Widenius2011-05-106-3/+11
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Automatic merge with 5.1Michael Widenius2011-05-083-0/+6
| | |\ \ \ | | | | |/ | | | |/|