Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |\ | |||||
| | * | 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 | 30 | -114/+104 |
| |\ \ | |||||
| | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 11 | -11/+22 |
* | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 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 | 47 | -4/+740 |
| |\ \ | | |/ | |||||
| | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 47 | -4/+740 |
* | | | 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 |
* | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 8 | -53/+54 |
|\ \ \ | |/ / | |||||
| * | | Bug#53463: YaSSL patch appears to be reverted | Davi Arnaut | 2010-07-28 | 1 | -1/+1 |
| * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -16/+8 |
| * | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 10 | -48/+54 |
* | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 15 | -62/+73 |
|\ \ \ | |/ / | |||||
| * | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-09 | 1 | -1/+9 |
| |\ \ | | |/ | |||||
| | * | Bug#34236: Various possibly related SSL crashes | Davi Arnaut | 2010-06-09 | 1 | -1/+9 |
| * | | Merge of mysql-5.0-bugteam into mysql-5.1-bugteam. | Davi Arnaut | 2010-06-08 | 15 | -61/+64 |
| |\ \ | | |/ | |||||
| | * | Bug#34236: Various possibly related SSL crashes | Davi Arnaut | 2010-06-08 | 15 | -61/+64 |
* | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 3 | -3/+3 |
|\ \ \ | |/ / | |||||
| * | | Bug #43414 Parenthesis (and other) warnings compiling | Staale Smedseng | 2010-02-22 | 3 | -3/+3 |
* | | | 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 |
|\ \ \ | |/ / | |||||
| * | | Auto-merge. | Ramil Kalimullin | 2010-01-13 | 2 | -55/+69 |
| |\ \ | | |/ | |||||
| | * | Fix for bug#50227: Pre-auth buffer-overflow in mySQL through yaSSL | Ramil Kalimullin | 2010-01-13 | 2 | -55/+69 |
* | | | 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 |
|\ \ \ | |/ / | |||||
| * | | Bug#47867 compiler warning _WIN32_WINNT macro redefinition | Magnus BlÄudd | 2009-10-06 | 1 | -1/+0 |
| * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 2 | -2/+2 |
* | | | 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 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix most Compiler warnings seen in buildbot. | unknown | 2009-09-03 | 6 | -9/+16 |
* | | | Merge from 5.0 | Staale Smedseng | 2009-06-29 | 4 | -1/+15 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge from 5.0-bt | Staale Smedseng | 2009-06-29 | 4 | -1/+15 |
* | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 4 | -5/+5 |
|\ \ | |/ | |||||
| * | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 8 | -22/+22 |
* | | Replace C++ comment in a header file. Thanks, Alik! | Chad MILLER | 2008-12-08 | 1 | -2/+2 |
* | | Addendum to the fix for bug #39178: Server crash in YaSSL | Georgi Kodinov | 2008-12-02 | 1 | -0/+1 |
* | | Update to change for bug 39178. Revert error-handling change, perhaps | Chad MILLER | 2008-11-20 | 1 | -1/+1 |
* | | Bug#39178: non-RSA keys in connection to a RSA-keyed yaSSL-using server \ | Chad MILLER | 2008-11-18 | 11 | -97/+275 |
* | | Fix "make dist" error - remove Visual Studio project files from | Vladislav Vaintroub | 2008-09-01 | 2 | -3/+2 |
* | | merge | Vladislav Vaintroub | 2008-09-01 | 2 | -479/+0 |
|\ \ | |/ | |||||
| * | Bug #33907 : Errors compiling mysql with Microsoft Visual C++ Express 2008 | Vladislav Vaintroub | 2008-08-21 | 2 | -479/+0 |