Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.4' into 10.5 | Oleksandr Byelkin | 2020-08-04 | 1 | -1/+1 |
|\ | |||||
| * | Merge branch '10.2' into 10.3 | Oleksandr Byelkin | 2020-08-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '10.1' into 10.2 | Oleksandr Byelkin | 2020-08-02 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Code comment spellfixes | Ian Gilfillan | 2020-07-22 | 1 | -1/+1 |
| | | * | imporve clang build | Eugene Kosov | 2019-06-25 | 1 | -1/+1 |
* | | | | perfschema memory related instrumentation changes | Sergei Golubchik | 2020-03-10 | 1 | -3/+5 |
|/ / / | |||||
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2020-01-31 | 1 | -3/+5 |
|\ \ \ | |/ / | |||||
| * | | MDEV-21586: Fix a warning for converting my_bool to bool | Marko Mäkelä | 2020-01-31 | 1 | -3/+4 |
| * | | MDEV-21586 Server does not start if lc_messages setting was not english. | Vladislav Vaintroub | 2020-01-30 | 1 | -2/+3 |
* | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-12-12 | 1 | -22/+53 |
|\ \ \ | |/ / | |||||
| * | | MDEV-11345 Compile english error messages into mysqld executable. | Vladislav Vaintroub | 2019-12-11 | 1 | -22/+53 |
* | | | 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 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| | * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | Fixed compiler error and some warnings on windows | Monty | 2016-08-23 | 1 | -1/+1 |
* | | | | | Add likely/unlikely to speed up execution | Monty | 2018-05-07 | 1 | -3/+4 |
* | | | | | Don't give warning about usage of --language with full path | Monty | 2018-01-30 | 1 | -2/+5 |
* | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch '10.2' into bb-10.2-mdev9543 | Sergei Petrunia | 2016-04-07 | 1 | -83/+172 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fixed but when generating .sys files | Monty | 2016-04-06 | 1 | -3/+5 |
| * | | | Added new range of MariaDB error messages, starting from 3000 | Monty | 2016-04-05 | 1 | -83/+170 |
|/ / / | |||||
* | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -15/+15 |
* | | | MDEV-6650 - LINT_INIT emits code in non-debug builds | Sergey Vojtovich | 2015-03-16 | 1 | -3/+1 |
|/ / | |||||
* | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -2/+2 |
* | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -11/+7 |
* | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Better error message when using --language or --log-bin | Michael Widenius | 2012-09-07 | 1 | -2/+2 |
* | | More fixes | Michael Widenius | 2012-08-17 | 1 | -3/+3 |
|/ | |||||
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -15/+4 |
|\ | |||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -18/+6 |
| |\ | |||||
| | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -18/+6 |
| | |\ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -16/+5 |
| | | |\ | |||||
| | * | | | Ensure we don't read a MariaDB 5.3 errmsg.sys file or new errmsg.sys file wit... | Michael Widenius | 2011-05-20 | 1 | -19/+67 |
| | |/ / | |||||
* | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -22/+81 |
|\ \ \ \ | |/ / / | |||||
| * | | | Changed MariaDB error numbers to start from 1900 to not conflict with MySQL e... | Michael Widenius | 2011-05-21 | 1 | -19/+67 |
| |/ / | |||||
* | | | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -16/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -16/+5 |
| |/ | |||||
* | | Bug#53251 mysql_library_init fails on second execution with embedded lib... | Alexey Botchkov | 2010-09-02 | 1 | -0/+2 |
* | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -2/+3 |
* | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-05-31 | 1 | -2/+3 |
* | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+6 |
* | | WL#2360 Performance schema | Marc Alff | 2010-01-06 | 1 | -14/+16 |
* | | Backport of: | Konstantin Osipov | 2009-11-24 | 1 | -3/+3 |
* | | WL#751 Error message construction, backport | Sergey Glukhov | 2009-10-15 | 1 | -28/+33 |
|/ | |||||
* | Doxygenize comments, a*.cc - field.cc . | unknown | 2007-10-09 | 1 | -13/+24 |
* | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-05-24 | 1 | -15/+19 |
|\ | |||||
| * | WL#3817: Simplify string / memory area types and make things more consistent ... | unknown | 2007-05-10 | 1 | -15/+19 |