summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* 10.0-monty mergeSergei Golubchik2013-07-2129-121/+197
|\
| * Fixes for innodb suite, merging tests from 5.6.Sergei Golubchik2013-07-151-1/+1
| * fix for maria.maria testSergei Golubchik2013-07-131-1/+6
| * fix the maria suiteSergei Golubchik2013-07-121-2/+7
| * Applied all changes from Igor and SanjaMichael Widenius2013-06-152-7/+20
| * Push a lot of small fixes to get larger parts to compileMichael Widenius2013-05-212-10/+25
| * Temporary commit of 10.0-mergeMichael Widenius2013-03-2628-100/+138
* | 10.0-base mergeSergei Golubchik2013-07-184-10/+27
|\ \
| * \ 5.5 mergeSergei Golubchik2013-07-172-6/+27
| |\ \
| | * | MDEV-4778: Incorrect results from Aria/MyISAM SELECT using index with prefix ...Sergey Petrunya2013-07-161-0/+19
| | * | MDEV-4466 Partitioned Aria table created by a previous version is recognized ...Sergei Golubchik2013-06-151-1/+1
| | * | Fixed some cache variables that could be set to higher value than what the co...Michael Widenius2013-06-062-5/+7
| * | | cleanup: remove LF_REQUIRE_PINS, use compile_time_assert() instead of reimple...Sergei Golubchik2013-06-242-4/+0
* | | | 10.0-base mergeSergei Golubchik2013-06-0620-286/+418
|\ \ \ \ | |/ / /
| * | | 5.5 mergeSergei Golubchik2013-06-0620-286/+418
| |\ \ \ | | |/ /
| | * | 5.3 merge.Sergei Golubchik2013-05-208-20/+67
| | |\ \
| | | * \ 5.2 mergeSergei Golubchik2013-05-208-20/+67
| | | |\ \
| | | | * \ 5.1 mergeSergei Golubchik2013-05-208-20/+67
| | | | |\ \
| | | | | * | MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ma_blockre...Michael Widenius2013-05-118-20/+67
| | * | | | | When one does 'REPAIR TABLE', update uuid() to the current systemMichael Widenius2013-05-142-0/+12
| | * | | | | Fixed MDEV-4291: Assertion `trid >= info->s->state.create_trid' failure or da...Michael Widenius2013-05-137-228/+281
| | * | | | | MDEV-3999: Valgrind errors 'invalid write' or assorted server crashes on conc...Michael Widenius2013-05-126-28/+47
| | * | | | | MDEV-4231: Possible bug in function _ma_apply_undo_row_insert()Michael Widenius2013-05-111-0/+6
| | * | | | | Compilation warnings.Sergei Golubchik2013-05-072-9/+4
| | * | | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1)Sergei Golubchik2013-04-171-1/+1
* | | | | | | Merge 10.0-base -> 10.0unknown2013-05-287-161/+272
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Added some fixes that should make MyISAM & Aria REPAIR work with more than 4G...Michael Widenius2013-05-107-161/+272
* | | | | | | Merge 10.0-base -> 10.0Igor Babaev2013-04-173-21/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge 5.5->10.0-baseunknown2013-04-173-21/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | compiler warningsSergei Golubchik2013-04-143-21/+9
* | | | | | | 10.0-base mergeSergei Golubchik2013-04-1519-67/+51
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | 5.5 mergeSergei Golubchik2013-04-143-10/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-4243 Warnings/errors while compiling with clangSergei Golubchik2013-03-283-10/+5
| * | | | | put status variables in the proper pluginname_ scopeSergei Golubchik2013-04-091-6/+1
| * | | | | * move bas_ext from the handler to the handlertonSergei Golubchik2013-04-072-7/+1
| * | | | | my_dir() cleanupSergei Golubchik2013-04-073-3/+3
| * | | | | remove ULL() and LL(), because they're totally unnecessarySergei Golubchik2013-04-0713-36/+37
| * | | | | 5.5 mergeSergei Golubchik2013-03-272-5/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Automatic mergeMichael Widenius2013-03-011-1/+0
| | |\ \ \ \
| | | * | | | Added support for --crash-script in mysqld_safe.Michael Widenius2013-02-281-1/+0
| | * | | | | 5.3->5.5 mergeSergei Golubchik2013-02-281-4/+4
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /
| | | * | | 5.2 -> 5.3Sergei Golubchik2013-02-281-4/+4
| | | |\ \ \ | | | | |/ /
| | | | * | 5.1 -> 5.2 mergeSergei Golubchik2013-02-281-4/+4
| | | | |\ \ | | | | | |/
| | | | | * MDEV-4203 : fix maria SE repair functions (wrong operator precedence)Vladislav Vaintroub2013-02-261-4/+4
| | | | * | Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-1/+1
| | | | |\ \ | | | | | |/
* | | | | | 10.0-base mergeSergei Golubchik2013-01-3113-23/+28
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-01-291-0/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed MDEV-3890: Server crash inserting record on a temporary table after tru...Michael Widenius2013-01-251-0/+3
| * | | | | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-2311-17/+17
| * | | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-2312-23/+25