| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -3/+0 |
| |\ | |||||
| | * | Merge 5.5-mwl248 -> 10.0-base | Igor Babaev | 2013-01-08 | 1 | -3/+0 |
| | |\ | |||||
| | | * | Fixed some compiler warnings | Michael Widenius | 2012-12-19 | 1 | -3/+0 |
| * | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 8 | -252/+0 |
| |\ \ \ | |/ / | |||||
| | * | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 8 | -252/+0 |
| | |/ | |||||
| * | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 18 | -75/+81 |
| |\ \ | |/ | |||||
| | * | 5.3 merge | Sergei Golubchik | 2012-10-18 | 1 | -2/+6 |
| | |\ | |||||
| | | * | Fix incorrect assembler in Taocrypt which causes crashes on i386 with certain... | unknown | 2012-09-27 | 1 | -2/+6 |
| | | * | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -0/+4 |
| | | |\ | |||||
| | * | \ | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 17 | -73/+75 |
| | |\ \ \ | |||||
| | | * \ \ | Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE | Venkata Sidagam | 2012-08-11 | 1 | -1/+1 |
| | | |\ \ \ | |||||
| | | | * | | | Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE | Venkata Sidagam | 2012-08-11 | 1 | -1/+1 |
| | | * | | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_R | Harin Vadodaria | 2012-08-07 | 1 | -37/+0 |
| | | |\ \ \ \ | | | |/ / / | |||||
| | | | * | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_R | Harin Vadodaria | 2012-08-07 | 2 | -38/+1 |
| | | | | |/ | | | |/| | |||||
| | | * | | | Bug#13904906: YASSL PRE-AUTH CRASH WITH 5.1.62, 5.5.22 | Harin Vadodaria | 2012-07-24 | 16 | -35/+74 |
| * | | | | | disable x86 asm version of taocrypt arc4 code for gcc, | Sergei Golubchik | 2012-10-30 | 1 | -0/+4 |
| * | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 2 | -1/+5 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Fixed compiler warnings | Michael Widenius | 2012-08-17 | 1 | -1/+1 |
| | * | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -0/+4 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | merge 5.1->5.5 | Georgi Kodinov | 2012-05-15 | 1 | -0/+4 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Bug #11761822: yassl rejects valid certificate which openssl accepts | Georgi Kodinov | 2012-05-15 | 1 | -0/+4 |
| * | | | | | Fixing test cases | Michael Widenius | 2012-08-23 | 2 | -3/+17 |
| * | | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 13 | -93/+251 |
| |/ / / / | |||||
| * | | | | merge | Sergei Golubchik | 2012-04-07 | 1 | -1/+4 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 99 | -941/+2110 |
| | |\ \ \ | | | |/ | | |/| | |||||
| * | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 95 | -811/+2020 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5. | Joerg Bruehe | 2012-03-02 | 7 | -17/+67 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | Upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.0 to 5.1. | Joerg Bruehe | 2012-03-02 | 7 | -17/+67 |
| | | |\ \ | |||||
| | | | * | | Further upgrade the yaSSL library to version 2.2.0 | Joerg Bruehe | 2012-03-02 | 7 | -17/+67 |
| | * | | | | merge mysql-5.1-security->mysql-5.5-security | Georgi Kodinov | 2012-02-13 | 94 | -797/+1958 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | merge from 5.0-security | Georgi Kodinov | 2012-02-13 | 95 | -796/+1955 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Bug #13706828: UPGRADE YASSL FROM 1.7.2 TO 2.1.4 | Georgi Kodinov | 2012-02-10 | 95 | -797/+1956 |
| | | | * | | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 | Georgi Kodinov | 2012-02-10 | 26 | -260/+372 |
| | | * | | | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 | Georgi Kodinov | 2012-02-10 | 31 | -134/+93 |
| * | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 14 | -14/+14 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 30 | -112/+136 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 2 | -6/+4 |
| | | |\ \ \ | |||||
| * | | | | | | Fix LPBUG# : allow chain certificate files to work. | Vladislav Vaintroub | 2011-12-27 | 1 | -3/+3 |
| * | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 32 | -32/+46 |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -3/+2 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge from mysql-5.1 to mysql-5.5 | Jon Olav Hauglid | 2011-06-17 | 1 | -1/+1 |
| | | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | | * | | | | Bug#12657095 YASSL ERROR MESSAGE CONTAINS TYPO | Jon Olav Hauglid | 2011-06-17 | 1 | -1/+1 |
| | * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 32 | -32/+47 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 30 | -114/+104 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 11 | -11/+22 |
| * | | | | | | fixes for windows | Sergei Golubchik | 2011-10-21 | 1 | -1/+1 |
| * | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 6 | -40/+15 |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | | typo (in the yassl error message) fixed | Sergei Golubchik | 2011-03-01 | 1 | -1/+1 |
| | * | | | | | Fixed compiler warnings | Michael Widenius | 2011-02-25 | 2 | -3/+3 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |