summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Automatic mergeMichael Widenius2012-03-283-4/+32
| |\ \ \ | | |/ /
| | * | Merge with 5.1Michael Widenius2012-03-283-4/+31
| | |\ \ | | | |/
| | | * Fixed lp:944422 "mysql_upgrade destroys Maria tables?"Michael Widenius2012-03-283-4/+31
* | | | Merge mariadb 5.3->mariadb 5.5unknown2012-03-241-1/+2
|\ \ \ \ | |/ / /
| * | | Speedups:Michael Widenius2012-03-231-1/+2
* | | | Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed i...Michael Widenius2012-03-204-6/+28
* | | | Cleanups:Michael Widenius2012-03-204-4/+28
* | | | monty's cleanup of my_thr_init.cSergei Golubchik2012-03-131-2/+1
* | | | 5.3 mergeSergei Golubchik2012-03-062-1/+9
|\ \ \ \ | |/ / /
| * | | Automatic mergeMichael Widenius2012-03-054-4/+18
| |\ \ \
| | * | | Ensure that we mark all processed tables as 'properly closed'.Michael Widenius2012-03-051-0/+8
| | * | | Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable ke...Michael Widenius2012-02-283-4/+10
* | | | | Merge 5.3->5.5.Igor Babaev2012-03-016-8/+23
|\ \ \ \ \ | |/ / / /
| * | | | mergeSergei Golubchik2012-02-285-5/+14
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'"Michael Widenius2012-02-284-5/+14
| * | | | Merge 5.2->5.3Sergey Petrunya2012-02-241-3/+9
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | 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
* | | | 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