summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | Merge 10.2 into 10.3Marko Mäkelä2019-05-14139-139/+139
| |\ \ \ | | |/ /
| | * | Merge 10.1 into 10.2Marko Mäkelä2019-05-13139-139/+139
| | |\ \ | | | |/
| | | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-114-4/+4
| | | |\
| | | | * Update FSF AddressVicențiu Ciorbaru2019-05-112-2/+2
| | | * | Update FSF addressVicențiu Ciorbaru2019-05-111-1/+1
| | | * | Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-11134-134/+134
| | | |\ \ | | | | |/
| | | | * Update FSF addressMichal Schorm2019-05-10134-134/+134
| * | | | cleanup: remove dead codeSergei Golubchik2019-05-072-92/+1
| * | | | cleanup: move checksum code to handler classSergei Golubchik2019-05-072-7/+1
* | | | | Removed obsolete file maria_rename.shMonty2019-05-131-17/+0
* | | | | Make maria-autozerofill a bit more rebustMonty2019-05-131-1/+1
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-04-252-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.2 into 10.3Marko Mäkelä2019-04-252-3/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge 10.1 into 10.2Marko Mäkelä2019-04-252-3/+3
| | |\ \ \ | | | |/ /
| | | * | Fixing -Werror=format-overflow errors (found by gcc-8.3.1)Alexander Barkov2019-04-222-3/+3
* | | | | Merge 10.3 into 10.4Marko Mäkelä2019-03-202-6/+20
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.2' into 10.3Sergei Golubchik2019-03-172-6/+20
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '10.1' into 10.2Sergei Golubchik2019-03-151-8/+9
| | |\ \ \ | | | |/ /
| | | * | fix gcc 8 compiler warningsSergei Golubchik2019-03-141-8/+9
| | * | | Fixed bug in redo handling of batch insert in AriaMonty2019-03-141-0/+13
* | | | | Removing warning from Aria recoveryMonty2019-03-141-1/+0