diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2005-01-10 13:17:30 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2005-01-10 13:17:30 +0000 |
| commit | 4fc0b3222c5c1153353f6a787095f5938b4920f1 (patch) | |
| tree | 7a30577a7f8cabf06f855f22526febae9145b38a /databases/mysql55-server/files/patch-sql::mysqld.cc | |
| parent | 7c218c32161b430a3ad981341adee672d9ffacdb (diff) | |
Update to 5.0.2 release:
- Use MASTER_SITES_MYSQL
- Add WITHOUT_INNODB knob [1]
- Fix tcp wrappers (hopefully definitely!)
- Add WITH_NDB knob
Submitted by: sobomax [1]
Notes
Notes:
svn path=/head/; revision=126051
Diffstat (limited to 'databases/mysql55-server/files/patch-sql::mysqld.cc')
| -rw-r--r-- | databases/mysql55-server/files/patch-sql::mysqld.cc | 51 |
1 files changed, 43 insertions, 8 deletions
diff --git a/databases/mysql55-server/files/patch-sql::mysqld.cc b/databases/mysql55-server/files/patch-sql::mysqld.cc index 1d0288494fb5..c98d38bcbd10 100644 --- a/databases/mysql55-server/files/patch-sql::mysqld.cc +++ b/databases/mysql55-server/files/patch-sql::mysqld.cc @@ -1,12 +1,47 @@ ---- 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 Tue Dec 14 13:40:36 2004 ++++ sql/mysqld.cc Mon Jan 10 00:28:52 2005 +@@ -128,7 +128,7 @@ + #endif /* __WIN__ */ + + #ifdef HAVE_LIBWRAP +-#include <tcpd.h> ++#include "mytcpd.h" + #include <syslog.h> + #ifdef NEED_SYS_SYSLOG_H + #include <sys/syslog.h> +@@ -136,15 +136,6 @@ 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__ */ + #endif /* HAVE_LIBWRAP */ + + #ifdef HAVE_SYS_MMAN_H +@@ -3565,8 +3556,8 @@ + struct request_info req; + signal(SIGCHLD, SIG_DFL); + request_init(&req, RQ_DAEMON, libwrapName, RQ_FILE, new_sock, NULL); +- my_fromhost(&req); +- if (!my_hosts_access(&req)) ++ fromhost(&req); ++ if (!hosts_access(&req)) + { + /* + This may be stupid but refuse() includes an exit(0) +@@ -3574,7 +3565,7 @@ + clean_exit() - same stupid thing ... + */ + syslog(deny_severity, "refused connect from %s", +- my_eval_client(&req)); ++ eval_client(&req)); + + /* + C++ sucks (the gibberish in front just translates the supplied |