Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2019-03-15 | 1 | -8/+9 |
|\ | |||||
| * | fix gcc 8 compiler warnings | Sergei Golubchik | 2019-03-14 | 1 | -8/+9 |
* | | Fixed bug in redo handling of batch insert in Aria | Monty | 2019-03-14 | 1 | -0/+13 |
* | | MDEV-17070 Table corruption or Assertion `table->file->stats.records > 0 || e... | Sergei Golubchik | 2019-03-12 | 4 | -18/+7 |
* | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-19 | 3 | -6/+3 |
|\ \ | |/ | |||||
| * | Fixed bug in macro _ma_mark_page_with_transid() | Monty | 2019-02-19 | 3 | -6/+3 |
* | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 3 | -12/+14 |
|\ \ | |/ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 3 | -12/+14 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-10-27 | 3 | -12/+14 |
| | |\ | |||||
| | | * | MDEV-9137 MariaDB Crash on Query Using Aria Engine | Sergei Golubchik | 2018-09-22 | 1 | -1/+1 |
| | | * | MDEV-9137 MariaDB Crash on Query Using Aria Engine | Sergei Golubchik | 2018-09-22 | 1 | -5/+10 |
| | | * | MDEV-9137 MariaDB Crash on Query Using Aria Engine | Sergei Golubchik | 2018-09-22 | 1 | -6/+3 |
* | | | | Remove not used variable | Michael Widenius | 2018-10-05 | 1 | -2/+0 |
* | | | | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2018-09-14 | 2 | -7/+15 |
|\ \ \ \ | |/ / / | |||||
| * | | | post merge | Oleksandr Byelkin | 2018-09-07 | 1 | -9/+9 |
| * | | | Merge branch '11.0' into 10.1 | Oleksandr Byelkin | 2018-09-06 | 1 | -3/+11 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0bb-10.0-merge-sanja | Oleksandr Byelkin | 2018-09-03 | 1 | -5/+13 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-16682 Assertion `(buff[7] & 7) == HEAD_PAGE' failed | Monty | 2018-09-03 | 1 | -5/+13 |
| * | | | compiler warnings (clang 4.0.1 on i386) | Sergei Golubchik | 2018-09-04 | 2 | -4/+4 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-08-31 | 6 | -6/+19 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-15797 Assertion `thd->killed != 0' failed in ha_maria::enable_indexes | Monty | 2018-08-27 | 6 | -6/+19 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 4 | -41/+196 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Alexander Barkov | 2018-06-20 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Alexander Barkov | 2018-06-20 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-16534 PPC64: Unexpected error with a negative value into auto-increment ... | Alexander Barkov | 2018-06-20 | 1 | -1/+1 |
| * | | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Alexander Barkov | 2018-06-19 | 1 | -32/+187 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Alexander Barkov | 2018-06-19 | 1 | -32/+187 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-15113: Hang in Aria loghandler | Oleksandr Byelkin | 2018-06-12 | 1 | -32/+187 |
| * | | | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 3 | -8/+8 |
| |\ \ \ | |||||
| | * \ \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 4 | -13/+13 |
| | |\ \ \ | |||||
| | | * \ \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 3 | -6/+9 |
| | | |\ \ \ | |||||
| | | * | | | | MDEV-8743: protect myisam/aria MYI with O_CLOEXEC | Daniel Black | 2018-03-02 | 1 | -2/+2 |
| | | * | | | | MDEV-8743: protect myisam/aria MYD files and aria log files | Daniel Black | 2018-03-02 | 3 | -6/+6 |
* | | | | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Monty | 2018-05-24 | 13 | -113/+188 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Monty | 2018-05-24 | 13 | -113/+188 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Fixes for Aria transaction handling with lock tables | Monty | 2018-05-22 | 13 | -113/+188 |
* | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-05-20 | 2 | -0/+13 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-05-19 | 2 | -1/+14 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-05-19 | 2 | -0/+9 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | MDEV-654 Assertion `share->now_transactional' failed in flush_log_for_bitmap ... | Monty | 2018-05-15 | 2 | -0/+9 |
| | | | |_|/ | | | |/| | | |||||
| | * | | | | Fix that FLUSH TABLES FOR EXPORT also works for Aria tables. | Monty | 2018-05-16 | 1 | -1/+1 |
| | * | | | | MDEV-14943 Alter table ORDER BY bug | Monty | 2018-05-15 | 2 | -0/+4 |
| * | | | | | MDEV-14265 - RPMLint warning: shared-lib-calls-exit | Sergey Vojtovich | 2018-03-16 | 5 | -5/+5 |
* | | | | | | Remove most 'register' use in C++ | Marko Mäkelä | 2018-04-24 | 3 | -9/+8 |
* | | | | | | MDEV-15575 different results when using CTE and big_tables=1. | Igor Babaev | 2018-04-16 | 1 | -0/+3 |
* | | | | | | After-merge fix for commit 98eb9518db1da854048b09d94244a982a1d32f9a | Marko Mäkelä | 2018-03-16 | 5 | -5/+5 |
* | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-02-22 | 1 | -3/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-02-22 | 1 | -3/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-02-22 | 1 | -5/+5 |
| | |\ \ \ \ | | | |/ / / | | | | / / | | | |/ / | | |/| | | |||||
| | | * | | MDEV-13748 Assertion `status_var.local_memory_used == 0 || !debug_assert_on_n... | Sergei Golubchik | 2018-02-14 | 1 | -5/+5 |