Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | Sergei Golubchik | 2012-04-07 | 1 | -1/+4 |
|\ | |||||
| * | mysql-5.1.62 mergemariadb-5.1.62 | 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.mysql-5.5.22 | Joerg Bruehe | 2012-03-02 | 7 | -17/+67 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.0 to 5.1.mysql-5.1.62 | Joerg Bruehe | 2012-03-02 | 7 | -17/+67 |
| | |\ \ | |||||
| | | * | | Further upgrade the yaSSL library to version 2.2.0mysql-5.0.96 | 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 |
| * | | | | | fixes for solaris 10 | Sergei Golubchik | 2011-01-26 | 3 | -0/+11 |
| * | | | | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 7 | -24/+0 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 46 | -51/+634 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | merge from mysql5.1 for bug#11760210 | Mayank Prasad | 2011-03-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | |||||
| | * | | | | BUG #11760210: 52596: SSL_CIPHER_LIST NOT SET OR RETURNED FOR "SHOW STATUS LI... | Mayank Prasad | 2011-03-11 | 1 | -1/+1 |
| | | |/ / | | |/| | | |||||
| * | | | | Merge | Kent Boortz | 2010-12-29 | 38 | -2/+633 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge | Kent Boortz | 2010-12-29 | 47 | -4/+740 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 47 | -4/+740 |
| * | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 7 | -48/+0 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 9 | -10/+24 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 8 | -53/+54 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 15 | -62/+73 |
| |\ \ \ | |||||
| * \ \ \ | Merge MySQL 5.1.46 into MariaDB.mariadb-merge-mysql-5.1.46 | unknown | 2010-04-28 | 3 | -3/+3 |
| |\ \ \ \ | |||||
| * | | | | | Fix a bunch of Windows warnings | Bo Thorsen | 2010-04-21 | 1 | -1/+0 |
| * | | | | | Merge MySQL 5.1.44 into MariaDB.mariadb-merge-mysql-5.1.44 | unknown | 2010-03-04 | 1 | -46/+42 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Changed version number from RC to stable | Michael Widenius | 2010-01-29 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | YaSSL cert info buffer overflow fix | Sergei Golubchik | 2010-01-27 | 2 | -49/+67 |
| * | | | | | | | Fix some compiler warnings. | unknown | 2009-12-06 | 1 | -1/+2 |
| * | | | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 2 | -2/+1 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| * | | | | | | | Added federatedx storage engine | Michael Widenius | 2009-10-30 | 1 | -0/+2 |
| * | | | | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 4 | -1/+11 |
| * | | | | | | | Post-merge fixes | Sergey Petrunya | 2009-09-15 | 4 | -6/+5 |
| * | | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 6 | -8/+8 |
| |\ \ \ \ \ \ \ |