summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* Fix clang 10 warningsMarko Mäkelä2020-04-271-1/+2
* Aria: Avoid unused variables in embedded serverMarko Mäkelä2020-04-271-1/+1
* Fix GCC 10 -WoverflowMarko Mäkelä2020-04-171-1/+2
* 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
* 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
* | Fixing -Werror=format-overflow errors (found by gcc-8.3.1)Alexander Barkov2019-04-222-3/+3
* | fix gcc 8 compiler warningsSergei Golubchik2019-03-141-8/+9
* | Fixed bug in macro _ma_mark_page_with_transid()Monty2019-02-193-6/+3
* | Merge branch '10.0' into 10.1Sergei Golubchik2018-10-303-12/+14
|\ \
| * \ Merge branch '5.5' into 10.0Sergei Golubchik2018-10-273-12/+14
| |\ \ | | |/
| | * MDEV-9137 MariaDB Crash on Query Using Aria EngineSergei Golubchik2018-09-221-1/+1
| | * MDEV-9137 MariaDB Crash on Query Using Aria EngineSergei Golubchik2018-09-221-5/+10
| | * MDEV-9137 MariaDB Crash on Query Using Aria EngineSergei Golubchik2018-09-221-6/+3
* | | post mergeOleksandr Byelkin2018-09-071-9/+9
* | | Merge branch '11.0' into 10.1Oleksandr Byelkin2018-09-061-3/+11
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0bb-10.0-merge-sanjaOleksandr Byelkin2018-09-031-5/+13
| |\ \ | | |/
| | * MDEV-16682 Assertion `(buff[7] & 7) == HEAD_PAGE' failedMonty2018-09-031-5/+13
* | | compiler warnings (clang 4.0.1 on i386)Sergei Golubchik2018-09-042-4/+4
* | | MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexesMonty2018-08-276-6/+19
* | | Merge remote-tracking branch 'origin/10.0' into 10.1Alexander Barkov2018-06-201-1/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.5' into 10.0Alexander Barkov2018-06-201-1/+1
| |\ \ | | |/
| | * MDEV-16534 PPC64: Unexpected error with a negative value into auto-increment ...Alexander Barkov2018-06-201-1/+1
* | | Merge remote-tracking branch 'origin/10.0' into 10.1Alexander Barkov2018-06-191-32/+187
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'origin/5.5' into 10.0Alexander Barkov2018-06-191-32/+187
| |\ \ | | |/
| | * MDEV-15113: Hang in Aria loghandlerOleksandr Byelkin2018-06-121-32/+187
* | | Merge branch '10.0-galera' into 10.1Vicențiu Ciorbaru2018-06-123-8/+8
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galeraJan Lindström2018-05-074-13/+13
| |\ \ \
| | * \ \ Merge tag 'mariadb-5.5.60' into 5.5-galeraJan Lindström2018-04-243-6/+9
| | |\ \ \
| | * | | | MDEV-8743: protect myisam/aria MYI with O_CLOEXECDaniel Black2018-03-021-2/+2
| | * | | | MDEV-8743: protect myisam/aria MYD files and aria log filesDaniel Black2018-03-023-6/+6
* | | | | | Merge remote-tracking branch 'origin/10.0' into 10.1Monty2018-05-2413-113/+188
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fixes for Aria transaction handling with lock tablesMonty2018-05-2213-113/+188
* | | | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-05-192-1/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '5.5' into 10.0Sergei Golubchik2018-05-192-0/+9
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | MDEV-654 Assertion `share->now_transactional' failed in flush_log_for_bitmap ...Monty2018-05-152-0/+9
| | | |_|/ | | |/| |
| * | | | Fix that FLUSH TABLES FOR EXPORT also works for Aria tables.Monty2018-05-161-1/+1
| * | | | MDEV-14943 Alter table ORDER BY bugMonty2018-05-152-0/+4
* | | | | MDEV-14265 - RPMLint warning: shared-lib-calls-exitSergey Vojtovich2018-03-165-5/+5
* | | | | Merge branch '10.0' into 10.1Sergei Golubchik2018-02-221-3/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '5.5' into 10.0Sergei Golubchik2018-02-221-5/+5
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | MDEV-13748 Assertion `status_var.local_memory_used == 0 || !debug_assert_on_n...Sergei Golubchik2018-02-141-5/+5
* | | | Fixed performance problem with Aria in find_head()Monty2018-02-172-32/+212
* | | | Merge branch 'github/10.0' into 10.1Sergei Golubchik2018-02-029-32/+73
|\ \ \ \ | |/ / /