summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.2 into 10.3Marko Mäkelä2018-11-063-9/+13
|\
| * Merge 10.1 into 10.2Marko Mäkelä2018-11-063-12/+14
| |\
| | * 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
* | | | | Merge 10.2 into 10.3Marko Mäkelä2018-10-091-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | Remove not used variableMichael Widenius2018-10-051-2/+0
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-09-282-7/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Oleksandr Byelkin2018-09-142-7/+15
| |\ \ \ \ | | |/ / /
| | * | | 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
* | | | | Merge 10.2 into 10.3Marko Mäkelä2018-09-066-6/+19
|\ \ \ \ \ | |/ / / /
| * | | | Merge 10.1 into 10.2Marko Mäkelä2018-08-316-6/+19
| |\ \ \ \ | | |/ / /
| | * | | MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexesMonty2018-08-276-6/+19
* | | | | Fixed several issues with aria_chkMonty2018-08-316-21/+56
* | | | | Merge branch '10.2' into 10.3Sergei Golubchik2018-06-304-41/+196
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-06-214-41/+196
| |\ \ \ \ | | |/ / /
| | * | | 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 10.2 into 10.3Marko Mäkelä2018-05-2913-113/+188
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'origin/10.1' into 10.2Monty2018-05-2413-113/+188
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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
* | | | | | | | Cleanup isnan() portability checksSergey Vojtovich2018-05-262-4/+0
* | | | | | | | Merge branch 'github/10.2' into 10.3Sergei Golubchik2018-05-222-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '10.1' into 10.2Sergei Golubchik2018-05-202-0/+13
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | 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
* | | | | | | MDEV-654 Assertion `share->now_transactional' failed in flush_log_for_bitmap ...Monty2018-05-152-0/+9
* | | | | | | Removed even more warning that was found with -WunusedMonty2018-04-305-21/+11
* | | | | | | Merge 10.2 into 10.3Marko Mäkelä2018-04-243-9/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Remove most 'register' use in C++Marko Mäkelä2018-04-243-9/+8
View Lorry Controller Status