Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed crash in aria recovery when using bulk insert | Monty | 2020-05-26 | 1 | -6/+9 |
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Update FSF address | Michal Schorm | 2019-05-10 | 1 | -1/+1 |
* | | | 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 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-02-19 | 1 | -2/+1 |
|\ \ \ | |/ / | |||||
| * | | Fixed bug in macro _ma_mark_page_with_transid() | Monty | 2019-02-19 | 1 | -2/+1 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -5/+10 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 1 | -5/+10 |
| |\ \ | |||||
| | * \ | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-10-27 | 1 | -5/+10 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-9137 MariaDB Crash on Query Using Aria Engine | Sergei Golubchik | 2018-09-22 | 1 | -5/+10 |
* | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix for MDEV-14141 Crash in print_keydup_error() | Monty | 2018-01-24 | 1 | -1/+1 |
* | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -7/+7 |
* | | | | Added tmp_disk_table_size to limit size of Aria temp tables in tmpdir | Monty | 2017-06-30 | 1 | -3/+4 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
* | | | | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_difference | Alexander Barkov | 2016-03-31 | 1 | -1/+1 |
|/ / / | |||||
* | | | Use MEM_CHECK_DEFINED to check if blocks contain uninitialized data | Monty | 2015-11-10 | 1 | -1/+1 |
* | | | MDEV-6650 - LINT_INIT emits code in non-debug builds | Sergey Vojtovich | 2015-03-16 | 1 | -2/+1 |
* | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -11/+13 |
|/ / | |||||
* | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -2/+2 |
|\ \ | |||||
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -4/+4 |
|\ \ \ | |||||
| * \ \ | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -4/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fixed some cache variables that could be set to higher value than what the co... | Michael Widenius | 2013-06-06 | 1 | -4/+4 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | 5.3 merge. | Sergei Golubchik | 2013-05-20 | 1 | -0/+1 |
| | |\ | |||||
| | | * | 5.2 merge | Sergei Golubchik | 2013-05-20 | 1 | -0/+1 |
| | | |\ | |||||
| | | | * | 5.1 merge | Sergei Golubchik | 2013-05-20 | 1 | -0/+1 |
| | | | |\ | |||||
| | | | | * | MDEV-4280: Assertion `empty_size == empty_size_on_page' failure in ma_blockre... | Michael Widenius | 2013-05-11 | 1 | -0/+1 |
| | * | | | | Fixed compiler warnings (A few of these was bugs) | Michael Widenius | 2012-08-13 | 1 | -0/+2 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -3/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -2/+2 |
| * | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -3/+3 |
* | | | | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -5/+4 |
|/ / / / / | |||||
* | | | | | Fixed build failures found by buildbot | Michael Widenius | 2012-06-05 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Merge 5.3->5.5. | Igor Babaev | 2012-03-01 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge | Sergei Golubchik | 2012-02-28 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed lp:905716 "Assertion `page->size <= share->max_index_block_size'" | Michael Widenius | 2012-02-28 | 1 | -0/+2 |
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -4/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -4/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+6 |
| | |\ \ | | | |/ | |||||
| | | * | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -1/+1 |
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+5 |
* | | | | Fix compile error | Vladislav Vaintroub | 2012-01-03 | 1 | -3/+4 |
* | | | | Fix compile warnings | Sergey Petrunya | 2012-01-02 | 1 | -2/+2 |