summaryrefslogtreecommitdiff
path: root/mysys_ssl
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'mariadb-10.0.24' into 10.0-galeraNirbhay Choubey2016-02-231-0/+4
|\
| * after-merge: 10.0 part of MDEV-9249 (ERR_remove_state)Sergei Golubchik2015-12-211-0/+4
* | Merge tag 'mariadb-10.0.19' into 10.0-galeraNirbhay Choubey2015-05-092-12/+25
|\ \ | |/
| * MDEV-7788 my_md5 crashes with openssl in fips modeSergei Golubchik2015-05-031-6/+12
| * MDEV-7697 Client reports ERROR 2006 (MySQL server has gone away) or ERROR 201...Sergei Golubchik2015-05-031-6/+13
* | MDEV#5626 : Cannot install InnoDB/XtraDB pluginNirbhay Choubey2014-02-101-31/+0
* | Merge MariaDB-10.0.7 revision 3961.Jan Lindström2014-01-253-456/+32
|\ \ | |/
| * Do the partial merge of WL#5602 correctly:Sergei Golubchik2013-12-092-456/+0
|/
* SHA1 serviceSergei Golubchik2013-07-131-10/+20
* Applied all changes from Igor and SanjaMichael Widenius2013-06-152-40/+0
* Temporary commit of 10.0-mergeMichael Widenius2013-03-269-0/+1200