| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 10.2 into 10.3 | Marko Mäkelä | 2018-11-06 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-11-06 | 1 | -1/+1 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-10-30 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * \ | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-10-27 | 1 | -1/+1 |
| | | | |\ \ | | | | |/ | |||||
| | | | | * | MDEV-9137 MariaDB Crash on Query Using Aria Engine | Sergei Golubchik | 2018-09-22 | 1 | -1/+1 |
| * | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2018-02-04 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Added name to MEM_ROOT for esier debugging | Monty | 2018-02-02 | 1 | -1/+1 |
| | |/ / / / | |||||
| * | | | | | Fix that end_bulk_insert() doesn't write to to-be-deleted files | Monty | 2017-05-17 | 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 |
| | |/ / | |||||
| * | | | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_difference | Alexander Barkov | 2016-03-31 | 1 | -4/+4 |
| |/ / | |||||
| * | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
| * | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -2/+15 |
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
| * | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -2/+2 |
| |/ | |||||
| * | fix the build and compiler warnings (few of which were real bugs) | Sergei Golubchik | 2011-10-29 | 1 | -2/+1 |
| * | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+4 |
| |\ | |||||
| | * | Merge with 5.2 (To get in fixes for Aria) | Michael Widenius | 2011-01-11 | 1 | -0/+2 |
| | |\ | |||||
| | | * | automatic merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -0/+2 |
| | | |\ | |||||
| | | | * | Safety fix for Aria: | Michael Widenius | 2011-01-11 | 1 | -0/+2 |
| | * | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -2/+2 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Automatic merge with 5.1 | Michael Widenius | 2011-01-10 | 1 | -2/+2 |
| | | |\ \ | | | |/ | |||||
| | | | * | - Fixed that Aria works with HANDLER commands | Michael Widenius | 2011-01-10 | 1 | -2/+2 |
| * | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -28/+27 |
| |/ / / | |||||
| * | | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti... | Michael Widenius | 2010-07-16 | 1 | -6/+7 |
| |/ / | |||||
| * | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 1 | -1/+1 |
| |/ | |||||
| * | Fixes after comments from last push: | Michael Widenius | 2009-11-30 | 1 | -16/+19 |
| * | Remove compiler warnings (Including some warnings from -Wstrict-aliasing) | Michael Widenius | 2009-11-30 | 1 | -16/+15 |
| * | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -6/+32 |
| |\ | |||||
| | * | Merge of MyISAM changes done in 5.1-main, into Maria | Guilhem Bichot | 2009-02-12 | 1 | -6/+32 |
| * | | Code cleanup: | Michael Widenius | 2009-01-09 | 1 | -2/+2 |
| |/ | |||||
| * | Added versioning of Maria index | Michael Widenius | 2008-06-26 | 1 | -17/+31 |
| * | Merge of changes in MyISAM since December 16 -> April 1 | unknown | 2008-04-01 | 1 | -28/+50 |
| * | Mac compiler warnings fixed. | unknown | 2008-02-07 | 1 | -14/+16 |
| * | Fixed after-merge problems. | unknown | 2007-12-16 | 1 | -2/+2 |
| * | merging MyISAM changes into Maria (not done in 5.1->maria merge of | unknown | 2007-07-27 | 1 | -20/+31 |
| * | Merged with mysql-5.1 main tree. | unknown | 2007-07-02 | 1 | -17/+18 |
| * | GPL license update (same change as was done for all files in 5.1). | unknown | 2007-03-02 | 1 | -2/+1 |
| * | merge from MyISAM into Maria (last step of merge of 5.1 into Maria). | unknown | 2007-03-01 | 1 | -8/+8 |
| * | Merge with new version | unknown | 2007-01-23 | 1 | -18/+18 |
| |\ | |||||
| | * | Implementation of rows-in-block | unknown | 2007-01-18 | 1 | -17/+17 |
| * | | merge of recent MyISAM changes into Maria. | unknown | 2006-12-20 | 1 | -1/+0 |
| |/ | |||||
| * | Completion of merge of mysql-5.1 into mysql-maria. | unknown | 2006-08-10 | 1 | -26/+36 |
| * | Added storage/maria (based on MyISAM). WL#3245 | unknown | 2006-04-11 | 1 | -0/+955 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |