Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-05-19 | 1 | -0/+1 |
|\ | |||||
| * | Fixed assert in Aria on SHOW PROCEDURE STATUS | Monty | 2020-05-19 | 1 | -0/+1 |
* | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | 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 'bb-10.2-ext' into 10.3 | Sergei Golubchik | 2018-02-23 | 1 | -32/+209 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-02-22 | 1 | -32/+209 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed performance problem with Aria in find_head() | Monty | 2018-02-17 | 1 | -32/+209 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -2/+2 |
* | | | | Added DBUG_ASSERT_AS_PRINTF compile flag | Monty | 2017-08-24 | 1 | -1/+1 |
|/ / / | |||||
* | | | 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 |
* | | | General spell fixing in comments and strings | Otto Kekäläinen | 2016-06-08 | 1 | -1/+1 |
|/ / | |||||
* | | Fixed MDEV-9347 Not all rows returned by the C API | Monty | 2016-01-27 | 1 | -1/+16 |
* | | 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 | -18/+41 |
* | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -3/+7 |
|\ \ | |||||
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -3/+7 |
* | | | 5.5 merge | Sergei Golubchik | 2013-04-14 | 1 | -8/+3 |
|\ \ \ | | |/ | |/| | |||||
| * | | MDEV-4243 Warnings/errors while compiling with clang | Sergei Golubchik | 2013-03-28 | 1 | -8/+3 |
* | | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -7/+8 |
| |/ |/| | |||||
* | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
* | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+1 |
|/ | |||||
* | 5.3 merge | Sergei Golubchik | 2012-03-06 | 1 | -1/+1 |
|\ | |||||
| * | Fixed lp:925377 "Querying myisam table metadata while 'alter table..enable ke... | Michael Widenius | 2012-02-28 | 1 | -1/+1 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Merge with 5.1 + fixes for build failures in 5.2 | Michael Widenius | 2011-11-29 | 1 | -2/+2 |
| |\ | |||||
| | * | Fix Windows build, and a conversion truncation warning. | Vladislav Vaintroub | 2011-11-29 | 1 | -2/+2 |
| * | | merge, fix Windows warnings | Vladislav Vaintroub | 2011-11-29 | 1 | -1/+1 |
| * | | 5.1->5.2 merge (gcc 4.6 warnings and apple hwaddress fixes). | unknown | 2011-10-27 | 1 | -3/+1 |
| |\ \ | | |/ | |||||
| | * | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -3/+1 |
* | | | compiler warnings/errors | Sergei Golubchik | 2011-11-23 | 1 | -4/+2 |
* | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -3/+2 |
|\ \ \ | |||||
| * | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 1 | -3/+1 |
| |/ / | |||||
| * | | Fix compile warning | Vladislav Vaintroub | 2011-09-16 | 1 | -1/+1 |
* | | | fix the build and compiler warnings (few of which were real bugs) | Sergei Golubchik | 2011-10-29 | 1 | -7/+2 |
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -77/+335 |
|\ \ \ | |/ / | |||||
| * | | Fixes bugs found by testcase for lp:815022 and lp:726374 "ma_blockrec.c:3000:... | Michael Widenius | 2011-08-15 | 1 | -13/+21 |
| * | | Autmatic merge with 5.1 | Michael Widenius | 2011-08-12 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Fixed lp:814231 Aria post-recovery error "Bitmap at page 0 has pages reserved... | Michael Widenius | 2011-08-12 | 1 | -1/+1 |
| * | | Merge with 5.1 | Michael Widenius | 2011-07-25 | 1 | -12/+80 |
| |\ \ | | |/ | |||||
| | * | Fixes lp:805930 Sysbench breaks on multiple table test with MariaDB 5.2.7 + Aria | Michael Widenius | 2011-07-24 | 1 | -14/+74 |
| | * | Fixes to aria | Michael Widenius | 2011-06-24 | 1 | -5/+3 |
| * | | Aria fixes: | Michael Widenius | 2011-07-04 | 1 | -7/+19 |
| * | | Aria bug fixes and improvements: | Michael Widenius | 2011-06-30 | 1 | -4/+7 |
| * | | Fixed several errors in Aria discovered by test case for lp:727869 ma_pagecac... | Michael Widenius | 2011-06-24 | 1 | -26/+54 |
| |/ | |||||
| * | Fix build : declaration in the middle of statement in C file. | Vladislav Vaintroub | 2011-02-10 | 1 | -4/+5 |
| * | Fixes for Aria storage engine: | Michael Widenius | 2011-02-10 | 1 | -8/+51 |