Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.5 merge | Sergei Golubchik | 2013-06-06 | 42 | -43/+76 |
|\ | |||||
| * | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 43 | -44/+77 |
| |\ | |||||
| | * | Updated/added copyright headers | Murthy Narkedimilli | 2013-02-26 | 43 | -46/+43 |
| | |\ | |||||
| | | * | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 45 | -48/+45 |
| | | * | Bug#15883127: PORT FIX FOR BUG #13904906 TO MYSQL 5.1 | Harin Vadodaria | 2012-11-21 | 7 | -12/+51 |
* | | | | 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 |
* | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 4 | -107/+0 |
|/ / / | |||||
* | | | 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.1.62 merge | Sergei Golubchik | 2012-04-05 | 56 | -474/+1270 |
| |\ \ \ \ | |||||
* | \ \ \ \ | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 8 | -49/+51 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | 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 | 7 | -12/+51 |
* | | | | | 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 |
| | | |/ | | |/| | |||||
* | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 56 | -382/+1228 |
|\ \ \ \ | |/ / / | |||||
| * | | | Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5. | Joerg Bruehe | 2012-03-02 | 3 | -10/+42 |
| |\ \ \ | | |/ / | |||||
| | * | | Upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.0 to 5.1. | Joerg Bruehe | 2012-03-02 | 3 | -10/+42 |
| | |\ \ | |||||
| | | * | | Further upgrade the yaSSL library to version 2.2.0 | Joerg Bruehe | 2012-03-02 | 3 | -10/+42 |
| * | | | | merge mysql-5.1-security->mysql-5.5-security | Georgi Kodinov | 2012-02-13 | 55 | -372/+1186 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge from 5.0-security | Georgi Kodinov | 2012-02-13 | 55 | -371/+1183 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug #13706828: UPGRADE YASSL FROM 1.7.2 TO 2.1.4 | Georgi Kodinov | 2012-02-10 | 55 | -371/+1183 |
| | | * | | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 | Georgi Kodinov | 2012-02-10 | 11 | -122/+59 |
| | * | | | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 | Georgi Kodinov | 2012-02-10 | 15 | -93/+45 |
* | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 9 | -9/+9 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 14 | -56/+47 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 15 | -15/+19 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 15 | -15/+19 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 14 | -56/+47 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 5 | -5/+10 |
* | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 4 | -39/+11 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fixed compiler warnings | Michael Widenius | 2011-02-25 | 2 | -3/+3 |
| * | | | | fixes for solaris 10 | Sergei Golubchik | 2011-01-26 | 2 | -0/+8 |
| * | | | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 4 | -13/+0 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 10 | -28/+99 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge | Kent Boortz | 2010-12-29 | 6 | -0/+99 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge | Kent Boortz | 2010-12-29 | 11 | -1/+160 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 11 | -1/+160 |
| * | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 4 | -28/+0 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 6 | -5/+17 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 6 | -37/+41 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 5 | -4/+7 |
| |\ \ \ | |||||
| * | | | | Fix a bunch of Windows warnings | Bo Thorsen | 2010-04-21 | 1 | -1/+0 |
| * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -46/+42 |
| |\ \ \ \ | |||||
| * | | | | | YaSSL cert info buffer overflow fix | Sergei Golubchik | 2010-01-27 | 2 | -49/+67 |