diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2004-09-22 22:22:32 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2004-09-22 22:22:32 +0000 |
| commit | 5a1e6a8f8fb25f631c5c1d445a2a913a64ac9fc6 (patch) | |
| tree | d14a45d6c8b6417bb7cd971d46a867d19c3f9031 /databases/mysql41-server/files/patch-sql::mysqld.cc | |
| parent | * Deactivate libtremor due to unresolved build problems (diff) | |
Update to 4.1.15 release:
- Fix a buffer overflow in prepared statements API
- Fix bug in remote connections caused by libwrap [1]
Patch by: peadar [1]
Approved by: portmgr (marcus)
Notes
Notes:
svn path=/head/; revision=118346
Diffstat (limited to 'databases/mysql41-server/files/patch-sql::mysqld.cc')
| -rw-r--r-- | databases/mysql41-server/files/patch-sql::mysqld.cc | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/databases/mysql41-server/files/patch-sql::mysqld.cc b/databases/mysql41-server/files/patch-sql::mysqld.cc index 1d0288494fb5..e9c1222d3773 100644 --- a/databases/mysql41-server/files/patch-sql::mysqld.cc +++ b/databases/mysql41-server/files/patch-sql::mysqld.cc @@ -1,12 +1,19 @@ ---- sql/mysqld.cc.orig Wed Feb 5 01:55:03 2003 -+++ sql/mysqld.cc Wed Feb 5 01:57:06 2003 -@@ -104,7 +104,8 @@ +--- sql/mysqld.cc.orig Thu Sep 16 23:47:47 2004 ++++ sql/mysqld.cc Tue Sep 21 23:56:49 2004 +@@ -115,15 +115,7 @@ int allow_severity = LOG_INFO; int deny_severity = LOG_WARNING; -#ifdef __STDC__ -+#include <osreldate.h> -+#if defined(__STDC__) && __FreeBSD_version < 500000 - #define my_fromhost(A) fromhost(A) - #define my_hosts_access(A) hosts_access(A) - #define my_eval_client(A) eval_client(A) +-#define my_fromhost(A) fromhost(A) +-#define my_hosts_access(A) hosts_access(A) +-#define my_eval_client(A) eval_client(A) +-#else +-#define my_fromhost(A) fromhost() +-#define my_hosts_access(A) hosts_access() +-#define my_eval_client(A) eval_client() +-#endif /* __STDC__ */ ++#include "mylibwrap.h" + #endif /* HAVE_LIBWRAP */ + + #ifdef HAVE_SYS_MMAN_H |