Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Eugene Kosov | 2019-07-16 | 1 | -1/+1 |
|\ | |||||
| * | Merge 10.1 into 10.2 | Eugene Kosov | 2019-07-09 | 1 | -1/+1 |
| |\ | |||||
| | * | Backport aria usage if LSN_FMT from 10.3 | Michael Widenius | 2019-06-25 | 1 | -2/+2 |
* | | | 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 |
* | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -5/+5 |
* | | | | remove ifdefs around PSI_THREAD_CALL | Sergei Golubchik | 2018-01-09 | 1 | -3/+1 |
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed compiler warnings | Michael Widenius | 2017-10-18 | 1 | -1/+1 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -5/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -5/+6 |
| |/ / | |||||
* | | | Remove dumping of some not needed core's when running test suite | Michael Widenius | 2017-08-24 | 1 | -2/+2 |
|/ / | |||||
* | | Correct FSF address | iangilfillan | 2017-03-10 | 1 | -1/+1 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -12/+8 |
|\ \ | |||||
| * \ | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -10/+8 |
| |\ \ | | |/ | |||||
| | * | MDEV-9994 - Aria service threads are not "joined" | Sergey Vojtovich | 2016-06-10 | 1 | -10/+8 |
| * | | Fixed problem with very slow shutdown when using 100,000 MyISAM tables with d... | Michael Widenius | 2014-07-19 | 1 | -1/+1 |
* | | | MDEV-8241: Debug build on Windows is broken: error LNK2019: unresolved extern... | Oleksandr Byelkin | 2015-05-29 | 1 | -1/+2 |
* | | | MDEV-7921: main.sp_sync fails in buildbot with valgrind | Oleksandr Byelkin | 2015-05-20 | 1 | -0/+1 |
* | | | Push for testing of encryption | Monty | 2015-02-10 | 1 | -1/+3 |
* | | | compiler warnings | Sergei Golubchik | 2014-10-01 | 1 | -1/+1 |
|/ / | |||||
* | | Fixed compiler warnings | Michael Widenius | 2014-06-04 | 1 | -2/+2 |
* | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -4/+4 |
|\ \ | |||||
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -4/+4 |
* | | | Merge 10.0-base -> 10.0 | Igor Babaev | 2013-04-17 | 1 | -3/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | compiler warnings | Sergei Golubchik | 2013-04-14 | 1 | -3/+1 |
* | | set username=hostname=NULL in the P_S for the aria background checkpoint thread | Sergei Golubchik | 2012-11-05 | 1 | -0/+4 |
|/ | |||||
* | Fixed compile warnings | Michael Widenius | 2012-05-18 | 1 | -0/+2 |
* | 5.3 merge | Sergei Golubchik | 2012-02-21 | 1 | -2/+5 |
|\ | |||||
| * | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -2/+5 |
| |\ | |||||
| | * | Fixed lp:902654 "MariaDB consistently crashes in collect_tables on Aria check... | Michael Widenius | 2012-02-20 | 1 | -2/+5 |
* | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -40/+50 |
|\ \ \ | |/ / | |||||
| * | | Automatic merge | Michael Widenius | 2011-10-05 | 1 | -6/+7 |
| |\ \ | | |/ | |||||
| | * | Fixed lp:859051 "Periodic aria checkpoints prevent power management" | Michael Widenius | 2011-10-05 | 1 | -5/+7 |
| * | | Merge 5.2->5.3 | unknown | 2011-09-02 | 1 | -40/+49 |
| |\ \ | | |/ | |||||
| | * | Added variable ARIA_CHECKPOINT_LOG_ACTIVITY to allow one to specify how often... | Michael Widenius | 2011-09-01 | 1 | -6/+13 |
* | | | fix the build and compiler warnings (few of which were real bugs) | Sergei Golubchik | 2011-10-29 | 1 | -7/+3 |
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -8/+36 |
|\ \ \ | |/ / | |||||
| * | | Automatic merge | Michael Widenius | 2011-07-04 | 1 | -8/+18 |
| |\ \ | | |/ | |||||
| | * | Aria fixes: | Michael Widenius | 2011-07-04 | 1 | -8/+18 |
| * | | Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK" | Michael Widenius | 2011-04-28 | 1 | -0/+7 |
| |/ | |||||
| * | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -0/+11 |
| |\ | |||||
| | * | Aria issues: | Michael Widenius | 2011-01-24 | 1 | -0/+11 |
* | | | use PSI wrappers in aria and other non-MySQL code | Sergei Golubchik | 2011-07-13 | 1 | -27/+28 |
* | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -7/+7 |
|/ / | |||||
* | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Trivial optimizations and cleanups | Michael Widenius | 2010-08-12 | 1 | -1/+0 |
* | | 5.1 -> 5.2 merge | unknown | 2009-04-03 | 1 | -2/+13 |
|\ \ | |/ |