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 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | | Make possible to use clang on Windows (clang-cl) | Vladislav Vaintroub | 2018-02-20 | 1 | -1/+1 |
* | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -19/+7 |
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2018-01-29 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix and reenable Windows compiler warning C4800 (size_t conversion). | Vladislav Vaintroub | 2018-01-26 | 1 | -2/+2 |
* | | | | MDEV-14113 Use abortive TCP close, in case server closes the connection | Vladislav Vaintroub | 2017-12-11 | 1 | -40/+11 |
* | | | | MDEV-14412 Support TCP keepalive options | Vladislav Vaintroub | 2017-11-17 | 1 | -0/+58 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -11/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -11/+11 |
* | | | | MDEV-11159 Server proxy protocol support | Vladislav Vaintroub | 2017-08-22 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -2/+24 |
|\ \ \ | |/ / | |||||
| * | | Cleanups and minor fixes | Monty | 2016-08-21 | 1 | -2/+24 |
* | | | MDEV-9154 : Remove workarounds (mainly dynamic function loading) | Vladislav Vaintroub | 2016-06-01 | 1 | -48/+1 |
|/ / | |||||
* | | MDEV-8014 MariaDB client can hang in an infinite loop | Sergei Golubchik | 2015-05-03 | 1 | -0/+3 |
* | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -7/+7 |
* | | Merge 10.0-base -> 10.0 | unknown | 2013-05-28 | 1 | -1/+3 |
|\ \ | |||||
| * | | Fixed errors and compiler warnings found by buildbot | Michael Widenius | 2013-05-05 | 1 | -2/+5 |
| |/ | |||||
* | | MDEV-4566 : Failing DBUG_ASSERT() in SELECT SLEEP(), with threadpool. | Vladislav Vaintroub | 2013-05-23 | 1 | -12/+12 |
* | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -6/+0 |
|\ \ | |/ | |||||
* | | MDEV-4226 [PATCH] "Unused variable" warnings in the tarball | Sergei Golubchik | 2013-04-04 | 1 | -1/+1 |
* | | MDEV-156 Threadpool - add thd_wait_begin/thd_wait_end to the network IO funct... | Vladislav Vaintroub | 2013-02-19 | 1 | -11/+42 |
* | | MDEV-3802: Millisecond timeout support in non-blocking client library + fix i... | unknown | 2012-10-12 | 1 | -0/+30 |
* | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -2/+8 |
* | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -554/+526 |
|/ | |||||
* | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 1 | -1/+1 |
|\ | |||||
| * | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 1 | -2/+38 |
| |\ | |||||
* | \ | c | Sergei Golubchik | 2012-05-21 | 1 | -1/+37 |
|\ \ \ | | |/ | |/| | |||||
| * | | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ... | Tatjana Azundris Nuernberg | 2012-02-19 | 1 | -1/+37 |
| |\ \ | | |/ | |/| | |||||
| | * | BUG#13431369 - MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON ... | Tatjana Azundris Nuernberg | 2012-02-17 | 1 | -1/+39 |
* | | | Update copyright notices | Vladislav Vaintroub | 2012-02-28 | 1 | -0/+1 |
* | | | merge 5.5 | Vladislav Vaintroub | 2012-02-27 | 1 | -5/+43 |
|\ \ \ | |||||
| * \ \ | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 1 | -5/+43 |
| |\ \ \ | |||||
| | * | | | MWL#192: non-blocking client API, after-review fixes. | unknown | 2012-01-06 | 1 | -7/+1 |
| | * | | | MWL#192: Non-blocking client API for libmysqlclient. | unknown | 2011-09-20 | 1 | -5/+54 |
* | | | | | further reduce diffs to 5.5, monty review | Vladislav Vaintroub | 2012-01-24 | 1 | -5/+6 |
* | | | | | merge | Vladislav Vaintroub | 2012-01-24 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | fixes for non-debug builds (CMAKE_BUILD_TYPE=Release or RelWithDebInfo) | Sergei Golubchik | 2012-01-17 | 1 | -2/+0 |
| * | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+3 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -4/+8 |
| | |\ \ \ \ | |||||
| | | * | | | | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 1 | -4/+8 |
| | * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -14/+17 |
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | | | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -14/+17 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -14/+14 |
| | | | |\ \ | |||||
| | | | * \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
| | | | |\ \ \ | |||||
| | | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | | | Initial threadpool implementation for MariaDB 5.5 | Vladislav Vaintroub | 2011-12-08 | 1 | -5/+78 |
|/ / / / / / / | |||||
* | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | |