Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.5 merge | Sergei Golubchik | 2013-06-06 | 19 | -19/+19 |
|\ | |||||
| * | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 20 | -20/+20 |
| |\ | |||||
| | * | Updated/added copyright headers | Murthy Narkedimilli | 2013-02-26 | 20 | -20/+20 |
| | |\ | |||||
| | | * | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 21 | -21/+21 |
| | | * | Bug#15883127: PORT FIX FOR BUG #13904906 TO MYSQL 5.1 | Harin Vadodaria | 2012-11-21 | 2 | -1/+24 |
* | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 3 | -103/+0 |
|/ / / | |||||
* | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 3 | -38/+24 |
|\ \ \ | |/ / | |||||
| * | | 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 | 2 | -1/+24 |
* | | | 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 | 22 | -261/+836 |
|\ \ \ | |/ / | |||||
| * | | Further upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.1 to 5.5. | Joerg Bruehe | 2012-03-02 | 2 | -3/+28 |
| |\ \ | | |/ | |||||
| | * | Further upgrade the yaSSL library to version 2.2.0 | Joerg Bruehe | 2012-03-02 | 2 | -3/+28 |
| * | | merge mysql-5.1-security->mysql-5.5-security | Georgi Kodinov | 2012-02-13 | 22 | -258/+808 |
| |\ \ | | |/ | |||||
| | * | Bug #13706828: UPGRADE YASSL FROM 1.7.2 TO 2.1.4 | Georgi Kodinov | 2012-02-10 | 23 | -259/+809 |
| | * | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 | Georgi Kodinov | 2012-02-10 | 8 | -101/+50 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 7 | -7/+7 |
|\ \ \ | |||||
| * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 9 | -36/+29 |
| |\ \ \ | |||||
* | \ \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 9 | -9/+10 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 9 | -9/+10 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 9 | -36/+29 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 2 | -2/+4 |
* | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fixed compiler warnings | Michael Widenius | 2011-02-25 | 1 | -2/+2 |
| * | | | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 1 | -4/+0 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 2 | -14/+15 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -0/+15 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge | Kent Boortz | 2010-12-29 | 2 | -0/+30 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 2 | -0/+30 |
| * | | | | WL#5665: Removal of the autotools-based build system | Davi Arnaut | 2010-11-20 | 1 | -14/+0 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 5 | -4/+15 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 4 | -20/+36 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -1/+2 |
| |\ \ \ | |||||
| * | | | | 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 | 1 | -49/+66 |
| * | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+0 |
| |\ \ \ \ \ | |||||
| * | | | | | | Added federatedx storage engine | Michael Widenius | 2009-10-30 | 1 | -0/+2 |
| * | | | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 3 | -0/+6 |
| * | | | | | | Post-merge fixes | Sergey Petrunya | 2009-09-15 | 1 | -2/+2 |
| * | | | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -2/+2 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix most Compiler warnings seen in buildbot. | unknown | 2009-09-03 | 1 | -3/+6 |
* | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| * | | | | | | | Bug#53463: YaSSL patch appears to be reverted | Davi Arnaut | 2010-07-28 | 1 | -1/+1 |
* | | | | | | | | Merge of mysql-trunk-bugfixing into mysql-trunk-merge. | Davi Arnaut | 2010-07-15 | 1 | -61/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -61/+0 |