diff options
author | Bernard Spil <brnrd@FreeBSD.org> | 2018-05-17 18:57:17 +0000 |
---|---|---|
committer | Bernard Spil <brnrd@FreeBSD.org> | 2018-05-17 18:57:17 +0000 |
commit | b007452891f34b093362d2fcf8de7f8e4754d64e (patch) | |
tree | 2997463aa1c9e1981549c56ce86737f176d6c83d /databases/mariadb102-server/files/patch-sql_mysqld.cc | |
parent | Install hgweb.cgi (diff) |
databases/mariadb102-server: Security update to 10.2.15
MFH: 2018Q2
Security: 57aec168-453e-11e8-8777-b499baebfeaf
Notes
Notes:
svn path=/head/; revision=470246
Diffstat (limited to 'databases/mariadb102-server/files/patch-sql_mysqld.cc')
-rw-r--r-- | databases/mariadb102-server/files/patch-sql_mysqld.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/databases/mariadb102-server/files/patch-sql_mysqld.cc b/databases/mariadb102-server/files/patch-sql_mysqld.cc index 17e28f8c2b7c..ab4a1ed810a5 100644 --- a/databases/mariadb102-server/files/patch-sql_mysqld.cc +++ b/databases/mariadb102-server/files/patch-sql_mysqld.cc @@ -1,21 +1,5 @@ --- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC +++ sql/mysqld.cc -@@ -111,6 +111,7 @@ - #endif - - #include <my_systemd.h> -+#include <my_crypt.h> - - #define mysqld_charset &my_charset_latin1 - -@@ -120,6 +121,7 @@ - #define HAVE_CLOSE_SERVER_SOCK 1 - #endif - -+ - extern "C" { // Because of SCO 3.2V4.2 - #include <sys/stat.h> - #ifndef __GNU_LIBRARY__ @@ -4838,8 +4840,9 @@ static void init_ssl() while ((err= ERR_get_error())) sql_print_warning("SSL error: %s", ERR_error_string(err, NULL)); |