Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -1/+1 |
|\ | |||||
| * | MDEV-3901: Wrong SSL error messages | Vladislav Vaintroub | 2012-12-01 | 1 | -1/+1 |
* | | MDEV-3822 :10.0-serg fails on windows buildslaves | Vladislav Vaintroub | 2012-11-04 | 1 | -49/+26 |
* | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -37/+55 |
|\ \ | |/ | |||||
| * | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -37/+55 |
| |\ | |||||
| | * | Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE | Venkata Sidagam | 2012-08-11 | 1 | -37/+55 |
| | |\ | |||||
| | | * | Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE | Venkata Sidagam | 2012-08-11 | 1 | -37/+55 |
* | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -5/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -6/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | merge 5.1->5.5 | Georgi Kodinov | 2012-05-15 | 1 | -5/+7 |
| | |\ \ | | | |/ | |||||
| | | * | Bug #11761822: yassl rejects valid certificate which openssl accepts | Georgi Kodinov | 2012-05-15 | 1 | -4/+6 |
* | | | | 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 |
* | | | | Compile 10.0 on Windows | Vladislav Vaintroub | 2012-08-30 | 1 | -3/+3 |
* | | | | More fixes | Michael Widenius | 2012-08-17 | 3 | -0/+19 |
* | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 8 | -708/+1341 |
|/ / / | |||||
* | | | 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 | 3 | -0/+3 |
* | | | merge 5.5 | Vladislav Vaintroub | 2012-02-27 | 2 | -7/+53 |
|\ \ \ | |||||
| * \ \ | Merge MWL#192: Non-blocking client library, into MariaDB 5.5. | unknown | 2012-02-21 | 2 | -7/+53 |
| |\ \ \ | |||||
| | * | | | MWL#192: non-blocking client API, after-review fixes. | unknown | 2012-01-06 | 2 | -11/+2 |
| | * | | | MWL#192: Non-blocking client API for libmysqlclient. | unknown | 2011-09-20 | 2 | -7/+67 |
* | | | | | further reduce diffs to 5.5, monty review | Vladislav Vaintroub | 2012-01-24 | 3 | -6/+8 |
* | | | | | merge | Vladislav Vaintroub | 2012-01-24 | 2 | -2/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 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 | 2 | -2/+5 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with 5.1 | Michael Widenius | 2011-11-30 | 2 | -6/+12 |
| | |\ \ \ \ | |||||
| | | * | | | | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 2 | -6/+12 |
| | * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 6 | -20/+61 |
| | |\ \ \ \ \ | | | |/ / / / | | | | / / / | | | |/ / / | | |/| | | | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 6 | -20/+61 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -14/+14 |
| | | | |\ \ | |||||
* | | | | \ \ | merge | Vladislav Vaintroub | 2011-12-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fix LPBUG# : allow chain certificate files to work. | Vladislav Vaintroub | 2011-12-27 | 1 | -1/+1 |
* | | | | | | | Initial threadpool implementation for MariaDB 5.5 | Vladislav Vaintroub | 2011-12-08 | 3 | -6/+106 |
|/ / / / / / | |||||
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 11 | -17/+49 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 10 | -16/+47 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 6 | -8/+49 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 2 | -4/+8 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+6 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Fix bugs found by application verifier : | Vladislav Vaintroub | 2011-05-14 | 1 | -1/+6 |
| | |_|_|/ / | |/| | | | | |||||
| * | | | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
| * | | | | | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 1 | -1/+7 |
* | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -2/+0 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 8 | -68/+86 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | build fixes for -Werror (11745920) | Tatjana Azundris Nuernberg | 2011-05-27 | 1 | -2/+4 |