summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.3' into 10.4Oleksandr Byelkin2019-12-093-3/+3
|\
| * Lintian complains on spelling errorFaustin Lammler2019-12-023-3/+3
* | Merge 10.3 into 10.4Aleksey Midenkov2019-12-021-1/+1
|\ \ | |/
| * MDEV-20441 ER_CRASHED_ON_USAGE upon update on versioned Aria tableAleksey Midenkov2019-12-021-1/+1
* | Merge 10.3 into 10.4Marko Mäkelä2019-11-191-3/+5
|\ \ | |/
| * MDEV-20611: MRR scan over partitioned InnoDB table produces "Out of memory" e...Sergei Petrunia2019-11-151-3/+5
* | Merge 10.3 into 10.4Marko Mäkelä2019-11-019-13/+55
|\ \ | |/
| * Write error message if aria_log.??????? files are missingMonty2019-10-208-10/+52
| * Merge 10.2 into 10.3Marko Mäkelä2019-10-181-11/+15
| |\
| | * Fixed bug in lock tables + alter table with Aria tables.Monty2019-10-161-11/+15
| | * MDEV-19740: Fix GCC 9.2.1 -Wmaybe-uninitialized on AMD64Marko Mäkelä2019-09-271-1/+1
* | | Merge 10.3 into 10.4Marko Mäkelä2019-10-104-12/+0
|\ \ \ | |/ /
| * | Cleanup mman.h includesSergey Vojtovich2019-10-024-12/+0
* | | Merge branch '10.3' into 10.4Sergei Golubchik2019-09-062-2/+17
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2019-09-042-2/+20
| |\ \ | | |/
| | * Fix of query cache bug in AriaMonty2019-09-042-2/+20
* | | Merge 10.3 into 10.4, except for MDEV-20265Marko Mäkelä2019-08-231-1/+1
|\ \ \ | |/ /
| * | MDEV-19740 Debug build of 10.3.15 FTBFSAleksey Midenkov2019-08-191-1/+1
* | | Merge 10.3 into 10.4Marko Mäkelä2019-08-141-1/+3
|\ \ \ | |/ /
| * | Merge 10.2 to 10.3Marko Mäkelä2019-08-131-1/+3
| |\ \ | | |/
| | * Fixed some errors & warnings found by clangMonty2019-08-081-1/+3
* | | Merge 10.3 into 10.4Marko Mäkelä2019-07-257-29/+49
|\ \ \ | |/ /
| * | Merge 10.2 into 10.3Marko Mäkelä2019-07-191-1/+4
| |\ \ | | |/
| | * Remove a conditionally unused declarationMarko Mäkelä2019-07-191-1/+4
| * | Merge 10.2 into 10.3Eugene Kosov2019-07-166-28/+45
| |\ \ | | |/
| | * Merge 10.1 into 10.2Eugene Kosov2019-07-096-28/+45
| | |\
| | | * imporve clang buildEugene Kosov2019-06-253-9/+8
| | | * Fixed Aria recovery progress printingMichael Widenius2019-06-252-20/+30
| | | * Give a readable error if aria_log page numbers doesn't matchMichael Widenius2019-06-251-2/+9
| | | * Backport aria usage if LSN_FMT from 10.3Michael Widenius2019-06-2515-240/+241
* | | | MDEV-19955 make argument of handler::ha_write_row() constEugene Kosov2019-07-053-3/+3
* | | | Merge 10.3 into 10.4Marko Mäkelä2019-07-023-16/+2
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2019-07-023-16/+2
| |\ \ \ | | |/ /
| | * | MDEV-14996 kill during FLUSH TABLES FOR EXPORT causes assertMonty2019-06-271-1/+1
| | * | MDEV-17576 Assertion in maria_extra upon ALTER on table with triggers and locksMonty2019-06-251-1/+0
| | * | Remove the unused function maria_cloneMarko Mäkelä2019-06-241-14/+1
* | | | Merge 10.3 into 10.4Marko Mäkelä2019-07-013-7/+44
|\ \ \ \ | |/ / /
| * | | MDEV-17551 assert or crashed table when using blobsMonty2019-06-273-7/+44
* | | | Limit minium aria_block_size to 4096Monty2019-06-261-1/+2
* | | | Merge 10.3 into 10.4Marko Mäkelä2019-06-198-12/+34
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2019-06-197-12/+29
| |\ \ \ | | |/ /
| | * | MDEV-19595 fixedMichael Widenius2019-06-195-9/+24
| | * | MDEV-18078 Assertion `trnman_has_locked_tables(trn) > 0' failedMichael Widenius2019-06-181-1/+2
| | * | MDEV-19055 Failures with temporary tables and AriaMichael Widenius2019-06-172-2/+3
| * | | Fixed that ma_test_all.sh worksMichael Widenius2019-06-161-0/+5
* | | | Merge 10.3 into 10.4Marko Mäkelä2019-06-121-2/+5
|\ \ \ \ | |/ / /
| * | | Merge 10.2 into 10.3Marko Mäkelä2019-06-111-2/+5
| |\ \ \ | | |/ /
| | * | MDEV-18207: ASAN heap-use-after-free in _ma_get_status upon concurrent operat...Vlad Lesin2019-05-311-2/+5
* | | | Merge branch '10.3' into 10.4Oleksandr Byelkin2019-05-19139-240/+143
|\ \ \ \ | |/ / /
| * | | MDEV-15458 Segfault in heap_scan() upon UPDATE after ADD SYSTEM VERSIONINGSergei Golubchik2019-05-171-2/+2