Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-10-10 | 1 | -3/+0 |
|\ | |||||
| * | Cleanup mman.h includes | Sergey Vojtovich | 2019-10-02 | 1 | -3/+0 |
* | | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-07-02 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | MDEV-17576 Assertion in maria_extra upon ALTER on table with triggers and locks | Monty | 2019-06-25 | 1 | -1/+0 |
* | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2019-05-19 | 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 10.3 into 10.4 | Marko Mäkelä | 2019-03-12 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-17070 Table corruption or Assertion `table->file->stats.records > 0 || e... | Sergei Golubchik | 2019-03-12 | 1 | -0/+2 |
* | | | | Optimize flush tables with read lock (FTWRL) to not wait for select's | Monty | 2018-12-09 | 1 | -0/+5 |
|/ / / | |||||
* | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Monty | 2018-05-24 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge remote-tracking branch 'origin/10.0' into 10.1 | Monty | 2018-05-24 | 1 | -2/+2 |
| |\ \ | |||||
| | * | | Fixes for Aria transaction handling with lock tables | Monty | 2018-05-22 | 1 | -2/+2 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -2/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -2/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -2/+1 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -1/+2 |
| | * | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -1/+2 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -1/+2 |
* | | | | 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 |
| |/ / | |||||
* | | | compiler warning | Sergei Golubchik | 2016-09-12 | 1 | -1/+1 |
* | | | MDEV-10216: Assertion `strcmp(share->unique_file_name,filename) || | Nirbhay Choubey | 2016-08-08 | 1 | -0/+1 |
|/ / | |||||
* | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -3/+3 |
* | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
|/ | |||||
* | Fixed lp:947474 "Assertion `table->file->stats.records > 0 || error' failed i... | Michael Widenius | 2012-03-20 | 1 | -0/+2 |
* | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -27/+50 |
|\ | |||||
| * | Automatic merge with 5.2 | Michael Widenius | 2011-08-15 | 1 | -4/+4 |
| |\ | |||||
| | * | Merge in bug fix from 5.1 | Michael Widenius | 2011-08-15 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Fixed bug lp:826377 "Aria DB Format: Reading specific table from dump causes ... | Michael Widenius | 2011-08-15 | 1 | -1/+1 |
| | * | | Optimize mutex usage. | Michael Widenius | 2011-08-08 | 1 | -3/+3 |
| | |/ | |||||
| * | | merge Windows performance patches into 5.3 | Vladislav Vaintroub | 2011-07-05 | 1 | -2/+1 |
| |\ \ | |||||
| | * | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -2/+1 |
| | |/ | |||||
| * | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -19/+37 |
| |\ \ | | |/ | |||||
| | * | Fixes for Aria storage engine: | Michael Widenius | 2011-02-10 | 1 | -13/+20 |
| | * | Aria issues: | Michael Widenius | 2011-01-24 | 1 | -6/+17 |
| * | | Merge in new handler and handlersocket code into 5.3 main | Michael Widenius | 2011-02-22 | 1 | -2/+2 |
| |\ \ | |||||
| | * \ | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | - Fixed that Aria works with HANDLER commands | Michael Widenius | 2011-01-10 | 1 | -2/+2 |
| * | | | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc... | Michael Widenius | 2011-02-18 | 1 | -0/+6 |
| |/ / | |||||
* | | | use PSI wrappers in aria and other non-MySQL code | Sergei Golubchik | 2011-07-13 | 1 | -28/+28 |
|/ / | |||||
* | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -0/+6 |
|\ \ | |/ | |||||
| * | When one does a drop table, the indexes are not flushed to disk before drop a... | Michael Widenius | 2010-02-10 | 1 | -0/+6 |
* | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -0/+9 |
|/ | |||||
* | Don't call _ma_decrement_open_count() for ma_extra(HA_EXTRA_PREPARE_FOR_DROP). | Michael Widenius | 2009-10-06 | 1 | -2/+9 |
* | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -4/+15 |
|\ | |||||
| * | Comments. Take bitmap mutex lock when changing bitmap.changed. | Guilhem Bichot | 2009-02-09 | 1 | -1/+5 |
| * | _ma_state_info_write numeric flags changed with constants. | unknown | 2009-01-08 | 1 | -3/+10 |