summaryrefslogtreecommitdiff
path: root/extra
Commit message (Expand)AuthorAgeFilesLines
* MariaDB made be compiled by gcc 4.8.1unknown2013-10-292-2/+2
* 5.2 -> 5.3Sergei Golubchik2013-02-2817-36/+81
|\
| * 5.1 -> 5.2 mergeSergei Golubchik2013-02-2817-36/+81
| |\
| | * mysql-5.1 mergeSergei Golubchik2013-02-2817-36/+81
| | |\
| | | * Bug#15965288: BUFFER OVERFLOW IN YASSL FUNCTIONHarin Vadodaria2012-12-131-1/+7
| | | * Bug#15883127: PORT FIX FOR BUG #13904906 TO MYSQL 5.1Harin Vadodaria2012-11-2116-35/+74
* | | | 5.2->5.3 mergeSergei Golubchik2013-01-102-3/+5
|\ \ \ \ | |/ / /
| * | | MDEV-712 - LP:1024239 - Mysqlclient exports the same symbols as opensslVladislav Vaintroub2012-11-232-3/+5
* | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-094-41/+5
|\ \ \ \ | |/ / /
| * | | Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-084-41/+5
| |\ \ \ | | |/ /
| | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-064-41/+5
| | |\ \ | | | |/
| | | * Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE Venkata Sidagam2012-08-111-1/+1
| | | * Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-071-2/+3
| | | * Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_RHarin Vadodaria2012-08-072-38/+1
* | | | mergeSergei Golubchik2012-09-271-2/+6
|\ \ \ \ | |/ / /
| * | | Merge from 5.1unknown2012-09-271-2/+6
| |\ \ \ | | |/ /
| | * | Fix incorrect assembler in Taocrypt which causes crashes on i386 with certain...unknown2012-09-271-2/+6
* | | | 5.2 merge.Sergei Golubchik2012-08-221-0/+4
|\ \ \ \ | |/ / /
| * | | 5.1 mergeSergei Golubchik2012-08-221-0/+4
| |\ \ \ | | |/ /
| | * | merge with MySQL 5.1.65Sergei Golubchik2012-08-221-0/+4
| | |\ \ | | | |/
| | | * Bug #11761822: yassl rejects valid certificate which openssl acceptsGeorgi Kodinov2012-05-151-0/+4
* | | | mergeSergei Golubchik2012-04-0599-941/+2110
|\ \ \ \ | |/ / /
| * | | mergeSergei Golubchik2012-04-0599-941/+2110
| |\ \ \ | | |/ /
| | * | mysql-5.1.62 mergeSergei Golubchik2012-04-0599-941/+2110
| | |\ \ | | | |/
| | | * Upmerge the yaSSL upgrade (to 2.2.0) from MySQL 5.0 to 5.1.Joerg Bruehe2012-03-027-17/+67
| | | |\
| | | | * Further upgrade the yaSSL library to version 2.2.0Joerg Bruehe2012-03-027-17/+67
| | | * | merge from 5.0-securityGeorgi Kodinov2012-02-1395-796/+1955
| | | |\ \ | | | | |/
| | | | * Bug #13706828: UPGRADE YASSL FROM 1.7.2 TO 2.1.4Georgi Kodinov2012-02-1095-797/+1956
| | | | * Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 Georgi Kodinov2012-02-1026-260/+372
| | | * | Bug#13706621 : UNIFY THE YASSL VERSIONS THAT WE USE BY BACKPORTING 5.1 Georgi Kodinov2012-02-1031-134/+93
* | | | | mergeSergei Golubchik2012-03-301-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | mergeSergei Golubchik2012-03-301-1/+1
| |\ \ \ \
| | * | | | mdev-205 don't install libevent headersSergei Golubchik2012-03-301-1/+1
| | |/ / /
* | | | | Merge with 5.2.Michael Widenius2011-12-1138-141/+177
|\ \ \ \ \ | |/ / / /
| * | | | Merge with MariaDB 5.1Michael Widenius2011-11-2438-141/+177
| |\ \ \ \ | | |/ / /
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2138-141/+177
| | |\ \ \ | | | |/ /
| | | * | 2nd fix for Bug #55713 innochecksum is NOT built with large file support ena...unknown2011-08-171-1/+0
| | | * | fix for bug 55713 innochecksum is NOT built with large file support enabledunknown2011-08-161-6/+1
| | | * | Updated/added copyright headersKent Boortz2011-07-035-17/+44
| | | |\ \
| | | | * \ Merge mysql-5.0 -> mysql-5.1Vasil Dimov2011-06-291-1/+1
| | | | |\ \
| | | | | * | Bug #12696083 FIX OUTDATED COPYRIGHT NOTICES IN INNODB RELATED CLIENT TOOLSVasil Dimov2011-06-291-1/+1
| | | | * | | Bug#12657095 YASSL ERROR MESSAGE CONTAINS TYPO Jon Olav Hauglid2011-06-171-1/+1
| | | | * | | BUG#11762616: BUG#55229: 'POSTION' Luis Soares2011-05-061-8/+10
| | | * | | | Updated/added copyright headersKent Boortz2011-06-3038-130/+137
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Updated/added copyright headersKent Boortz2011-06-3013-15/+30
| | | | | |/ | | | | |/|
* | | | | | when freeing a possibly NULL pointer under safemalloc - use MY_ALLOW_ZERO_PTRSergei Golubchik2011-10-111-1/+1
* | | | | | Fix comp_errr crash ( fprintf crashes wheb uninitialized string is passed)Vladislav Vaintroub2011-05-211-0/+1
* | | | | | Changed MariaDB error numbers to start from 1900 to not conflict with MySQL e...Michael Widenius2011-05-211-11/+73
|/ / / / /
* | | | | Small CMake fixes :Vladislav Vaintroub2011-05-151-8/+8
* | | | | Merge with MariaDB 5.1Michael Widenius2011-05-032-2/+31
|\ \ \ \ \ | |/ / / /