Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-04-24 | 1 | -3/+3 |
|\ | |||||
| * | register keyword c++17 warning | Eugene Kosov | 2018-04-24 | 1 | -2/+2 |
| * | Remove most 'register' use in C++ | Marko Mäkelä | 2018-04-24 | 1 | -1/+1 |
* | | omit system invisible fields from the duplicate key error | Sergei Golubchik | 2018-02-24 | 1 | -0/+2 |
* | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-02-15 | 1 | -2/+4 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2018-02-08 | 1 | -2/+4 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -2/+4 |
| | |\ | |||||
| | | * | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -2/+4 |
| | | |\ | |||||
| | | | * | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -2/+4 |
| | | | |\ | |||||
| | | | | * | MDEV-14586 Assertion `0' failed in retrieve_auto_increment ... | Sachin Setiya | 2018-01-23 | 1 | -2/+4 |
* | | | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -8/+8 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2018-01-15 | 1 | -11/+9 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2018-01-15 | 1 | -11/+9 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fix -Wsign-compare introduced by Compilation speed (#546) | Marko Mäkelä | 2018-01-15 | 1 | -2/+3 |
| | * | | | | Compilation speed (#546) | Eugene Kosov | 2018-01-14 | 1 | -11/+8 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-02 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -1/+1 |
* | | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Added "const" to new data for handler::update_row() | Michael Widenius | 2017-04-18 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge branch '10.2' of github.com:MariaDB/server into bb-10.2-mariarocks | Sergei Petrunia | 2017-03-11 | 1 | -13/+2 |
|\ \ \ \ | |||||
| * | | | | cleanup: TABLE::mark_columns_used_by_index() | Sergei Golubchik | 2017-02-13 | 1 | -2/+1 |
| * | | | | cleanup: remove TABLE::add_read_columns_used_by_index | Sergei Golubchik | 2017-02-13 | 1 | -11/+1 |
* | | | | | MariaRocks port: make key_restore() parameter const | Sergei Petrunia | 2016-10-16 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_difference | Alexander Barkov | 2016-03-31 | 1 | -3/+2 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -1/+0 |
|\ \ \ | |/ / | |||||
| * | | remove unneded #include's that had a dubious explanation | Sergei Golubchik | 2015-10-24 | 1 | -1/+0 |
* | | | MDEV-6650 - LINT_INIT emits code in non-debug builds | Sergey Vojtovich | 2015-03-16 | 1 | -13/+5 |
|/ / | |||||
* | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+1 |
| |\ | |||||
| | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
* | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -5/+5 |
* | | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1 | Sergei Golubchik | 2013-11-28 | 1 | -15/+17 |
* | | | MDEV-4786 merge 10.0-monty -> 10.0 | Sergei Golubchik | 2013-08-12 | 1 | -2/+2 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -17/+17 |
|\ \ \ | |/ / |/| | | |||||
| * | | Push a lot of small fixes to get larger parts to compile | Michael Widenius | 2013-05-21 | 1 | -5/+5 |
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -10/+10 |
* | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -42/+70 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING | Mattias Jonsson | 2013-01-30 | 1 | -42/+70 |
| |\ | |||||
* | \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
| | |\ | |||||
* | | \ | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -9/+317 |
|\ \ \ \ | |||||
| * | | | | Fixed compiler warnings and test cases problems found by buildbot | Michael Widenius | 2011-05-11 | 1 | -0/+1 |
| * | | | | Fixed compiler warnings | Michael Widenius | 2011-04-01 | 1 | -0/+6 |
| * | | | | Fixed LP bug #707827. | Igor Babaev | 2011-01-27 | 1 | -6/+2 |
| * | | | | Fixed LP bug #697557. | Igor Babaev | 2011-01-05 | 1 | -20/+2 |
| * | | | | Fixed LP bug #694443. | Igor Babaev | 2010-12-26 | 1 | -2/+7 |
| * | | | | Merge | Igor Babaev | 2010-12-24 | 1 | -0/+248 |
| |\ \ \ \ |