summaryrefslogtreecommitdiff
path: root/storage/maria
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch '5.5' into 10.0Vicențiu Ciorbaru2018-01-248-31/+72
| |\ \ \ | | |/ /
| | * | Free memory in unit tests. Makes ASAN happier.Sergei Golubchik2018-01-222-1/+4
| | |/
| | * compiler warningSergei Golubchik2018-01-151-1/+1
| | * Fixed misleading voariable names.Oleksandr Byelkin2018-01-111-9/+9
| | * MDEV-14690: Assertion `page_link == &fake_link' failed in pagecache_write_partOleksandr Byelkin2018-01-111-11/+29
| | * MDEV-8200 aria bug with insert select and lock tablesMonty2018-01-115-9/+26
| * | Fix for MDEV-14141 Crash in print_keydup_error()Monty2018-01-241-1/+1
* | | Merge 10.0 into 10.1Marko Mäkelä2018-01-031-7/+7
|\ \ \ | |/ /
| * | Merge 5.5 into 10.0Marko Mäkelä2018-01-031-7/+7
| |\ \ | | |/
| | * Silence some -Wimplicit-fallthrough by proper spellingMarko Mäkelä2018-01-031-7/+7